navbar fixes
add main.css file path from default theme
fix conflict
Merge branch 'themes-issue451' of github.com:hacklabr/timtec into themes-issue451

Conflicts:
	.gitignore