Alexander Schmidt / complete work for Sprint 12 DONE in a full night action :D
Merge branch 'master' of https://github.com/alexander-informatik/amos-project-audi

Conflicts:
	Root/src/main/webapp/WEB-INF/i18n/application.properties