inline styling fix
merge 'dev' into hierarchy, fix conflict

Conflicts:
	app/js/directives/form.js