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

Conflicts:
	app/eu/factorx/awac/angular/directives/awac/mmAwacForm7/template.jade
	app/eu/factorx/awac/angular/directives/awac/mmAwacRepetitionQuestion/template.jade
	public/javascripts/app.js
ui fixes
ui fixes