fixed navbarcolor
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/less/font.less
	lib/modules/gallery/lib/less/default_gallery.less
	lib/modules/gallery/lib/less/default_subgallery.less