style fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/japreview.js
	lib/javascripts/controllers.js
	lib/modules/navigationbar/lib/less/default.less