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

Conflicts:
	grunt/conf/watch.js