12: Added nav tabs at the top
32: Fixed defect where sometime the user didn't appear to be logged in
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml