Added account unlocking
merged changes in app files
fixed EmailRetreiver changes