fillingStationType creation
Merge branch 'feature_v_0.2' of https://github.com/glennsen/emobile into feature_v_0.2

Conflicts:
	grails-app/controllers/de/dfki/gs/controller/ms2/configuration/ConfigurationController.groovy
	grails-app/views/templates/_createCarType.gsp