Forms 1 to 6 encoded
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/eu/factorx/awac/angular/directives/awac/mmAwacForm2/template.jade
	app/eu/factorx/awac/angular/directives/awac/mmAwacForm4/template.jade
	app/eu/factorx/awac/angular/directives/awac/mmAwacSubTitle/template.jade
Forms 1 to 6 encoded