Add comments
remove useless parameter in initToken
Code cleaning: unify empty lines
remove description for home and proxy
merge conflicts
store masterKey in file and encrypt all field password