Clean up navigation
Change type to utype
Merge commit '28f01545b7c28a07e56f4ad105dba434a6d5a04d'

* commit '28f01545b7c28a07e56f4ad105dba434a6d5a04d':
  Change type to utype
  Clean up navigation

Conflicts:
	app/views/layouts/_navigation.html.haml