Don't use bootstrap tabs for secondary nav, improve highlighting
Merge branch 'master' into nav-reformat-and-header-rework

Conflicts:
	htdocs/js/mellivora.js
Merge pull request #37 from Nakiami/nav-reformat-and-header-rework

Don't use bootstrap tabs for secondary nav, improve highlighting