gallery, contactform
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/modules/contactform/lib/views/contactform.jade