Merge branch 'master' of https://github.com/jonahktjala/Klinikav2

Conflicts:
	grails-app/conf/Config.groovy
	grails-app/controllers/org/itech/klinikav2/domain/PaymentController.groovy
	grails-app/controllers/org/itech/klinikav2/domain/QueueElementController.groovy
	grails-app/domain/org/itech/klinikav2/domain/Item.groovy
	grails-app/views/queueElement/create.gsp
	target-eclipse/classes/messages_de.properties
	target/classes/application.properties
Merge branch 'master' of https://github.com/jonahktjala/Klinikav2

Conflicts:
	grails-app/controllers/org/itech/klinikav2/domain/PaymentController.groovy