new route system
new route system
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
.
merge to branch
merge to branch