mapping.js erzeugt, muss noch angepasst werden...
Merge remote-tracking branch 'origin/feature/granularity' into feature/granularity

Conflicts:
	timegranularity_widget/mapping.js
	timegranularity_widget/timegranularity.js