chore: changing navigation template so both state and route can be used version 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/modules/admin/admin.js