Merge pull request #17 from swagpeople-ch/develop

Develop
Navigation fix
Merge branch 'hotfix/Navhelper' into develop

Conflicts:
	app/Controller/UsersController.php