* initial version of the client settings page * fix test * fixed spelling * merge errors * fix merge error * renamed Step1 and Step2