12: Changed layout of login/logout area in header bar
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	templates/base.html
33: Added CRUD functionality for users