Cleaned up Angular logic.
Merge remote-tracking branch 'origin/HEAD' into HEAD

Conflicts:
	barista-matic/src/main/webapp/ng-app/partials/drink.html
Implemented navbar display (still need to add logic).
Implemented logout functionality.