before merge
end of integration of merge
end of integration of merge
end of CELDL-204 resolution
migration procedure
migration procedure
migration procedure
Merge remote-tracking branch 'origin/master' into CELDL-74-verification

Conflicts:
	app/eu/factorx/awac/angular/directives/awac/survey/mmAwacMunicipalitySurvey/template.jade
	public/javascripts/app.js
commit after merge with master