Merged changes in main.js, Admin and User modules. Fixed session.
Bug/s: Admin Edit Profile