Merge remote-tracking branch 'thehyve/postgresMigrate'
use inline plugin again
Merge latest changes from branch 'postgresMigrate' of https://github.com/transmart/transmartApp
Merge branch 'master' of https://github.com/thehyve/transmartApp

Conflicts:
	grails-app/conf/BuildConfig.groovy
Merge branch 'master' of https://github.com/transmart/transmartApp

Conflicts:
	grails-app/conf/BuildConfig.groovy
Merge remote-tracking branch 'origin/master'
* delete rdc-rmodules specification from application.properties because this is a deprecated way of declaring plugin dependencies in Grails 2, and prevents use of rdc-rmodules as inline plugin
* delete deprecated app.servlet.version specification from application.properties
* commented out rdc-rmodules inline plugin specification
Merge pull request #13 from thehyve/master

Fix incompatibility with inline Rmodules plugin setup introduced by latest changes - to provide for users ability to use inline modules, but still have the package build from the Rmodules plugin