Added user session handling
Merge branch 'master' of https://github.com/anantk17/project-X