Added ngCookies.
Renamed "/roles" redirect to "/role".
Added NavCtrl directive to navbar partial.
Added links to ngCookies and services.js scripts.
Merge remote-tracking branch 'origin/HEAD' into HEAD

Conflicts:
	barista-matic/src/main/webapp/ng-app/partials/drinkMenu.html
Removed unneeded module from js folder.