* made clientId required * changed space between the 2 columns of check boxes * merge fix
* initial version of the client settings page * fix test * fixed spelling * merge errors * fix merge error * renamed Step1 and Step2