Merge branch 'master' of https://github.com/rvbelapure/LearnOverLunch

Conflicts:
	src/mas/commons/Constants.java
	src/mas/learnoverlunch/handlers/LoginHandler.java
Merge branch 'master' of https://github.com/rvbelapure/LearnOverLunch