merge changes.
Merge branch 'master' of https://github.com/TejasP/AlphaBeta.git
Changes for removing the location Cookie on logout.