Merge commit
Merge branch 'master' of https://github.com/chankan/SmartKanteen

Conflicts:
	SmartKanteen/src/main/java/com/mastek/topcoders/smartkanteen/service/UserServiceImpl.java