Merge branch 'master' of https://github.com/ditma1/japreview

Conflicts:
	lib/modules/contactform/lib/less/default_categories.less
Merge remote-tracking branch 'origin/master'