Fix routes
Create basic controllers
Implement navi bar
Pre dev merge
Merge branch 'dev'
Implement locations list