Merge branch 'aritrik' of https://github.com/conde-nast-international/awesomelayer into aritrik
Merge branch 'aritrik' of https://github.com/conde-nast-international/awesomelayer into aritrik
Merge branch 'master' into aritrik
solve password encryption issue