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

Conflicts:
	SmartKanteen/src/main/java/com/mastek/topcoders/smartkanteen/rest/MenuResource.java
	SmartKanteen/src/main/webapp/js/admin.js
Updated DailyMenu Delete and RemoveItems methods
Merge branch 'master' of https://github.com/chankan/SmartKanteen