New branch created and Ingredient page UI done. Need to complete the
controller part of it
Added ingredient related service and controller definitions
Merging with main branch
Merge branch 'HEAD' of local repository into barista-matic_hemanth

Conflicts:
	barista-matic/src/main/resources/spring/applicationContext.xml
	barista-matic/src/main/webapp/ng-app/controllers.js
	barista-matic/src/main/webapp/ng-app/services.js
WIP functionality to purchase drinks and restock ingredients.