Removed init() function in LogoutCtrl
Merge remote-tracking branch 'origin/HEAD' into HEAD
Added ability to refresh web browser and maintain session.
Cleaned up intercept-url patterns.
Corrected the binding to get the drink name when "Buy this !" is clicked
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