Navigation links, display only neccessary links
Merge branch 'dev'

Conflicts:
	app/views/home/index.html.haml