Fixed Null pointer exception for user log out
Merge branch 'master' of https://github.com/blasv/DineOn into phase5_development
Merge pull request #395 from mhotan/phase5_development

Phase5 development