header navigation update
Merge branch 'master' of https://github.com/viljarsalu/tsr-bs3

Conflicts:
	app/partials/_components/_nav-main-menu-new.html