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

Conflicts:
	SmartKanteen/src/test/java/com/mastek/topcoders/smartkanteen/junit/TestMenuService.java
Merge branch 'master' of https://github.com/chankan/SmartKanteen
Merge branch 'master' of https://github.com/chankan/SmartKanteen
Tested Rest Services using UI for Caterer and Menu
Updated Some code in Admin.js ,MenuDAO
Updated Rest Classes