classname fix
fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/javascripts/controllers.js
	lib/modules/contactform/lib/less/default_contactform.less
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/views/index.jade