Fixes
Merge branch 'alex'

Conflicts:
	app/views/navbar-content.blade.php
	app/views/start.blade.php