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

Conflicts:
	grails-app/controllers/org/itech/klinikav2/domain/PaymentController.groovy
Merge branch 'master' of https://github.com/jonahktjala/Klinikav2

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