Switching to ui-router
Merge branch 'apicontroller' into ui-router
Navbar ui-view.
Migrated to ui-router
Last changes.
Merge branch 'ui-router' into develop