deleted some hard-coded paths in config
git ignore file created, added IntelliJ IDEA files to ignore list
added target folder and logs to ignore file
added Rmodules plugin zip
update ignore
local development commit
Merge branch 'master' of https://github.com/transmart/transmartApp

Conflicts:
	.classpath
	.gitignore
	.project
	application.properties
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/Config.groovy
Merge pull request #1 from transmart/master

Pull in changes from upstream master branch
remove duplicate log definition, fixed some merge changes and configured for in-place Rmodules plugin
Up to Grails 2.2.0 with a necessary change to BuildConfig to allow vanilla installs with Grails 2.2.0
Merge branch 'master' of https://github.com/thehyve/transmartApp

Conflicts:
	.gitignore
	application.properties
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/Config.groovy
delete eclipse profile and compiled rmodules
Delete PostgresI2b2HelperService, as it isn't used

Only the identical I2b2HelperService class is used.
rdc-rmodules plugin should have compile scope

Fixes "Advanced Workflow" not showing up in the Dataset Explorer;
likely other things.
File was empty; put empty class for grails to load

The class does not appear to be used anywhere though. It could probably
also be deleted.
Merge branch 'master' of git://github.com/thehyve/transmartApp into thehyve-master

Conflicts resolved:
	grails-app/conf/BuildConfig.groovy
Two files that are line ending changes only
Revert "Delete PostgresI2b2HelperService..."

This reverts commit b393cfc1974c8f03dd8d47eaeb91ef6959086f0b.

This could also be resolved by simply replacing the implementation of
the bean i2b2HelperService with the class I2b2HelperService, as
I2b2HelperService and PostgresI2b2HelperService have the same content.
But there are other Postgres specific classes that are identical copies
of their original files and they should probably be handled together, if
not by deleting the postgres specific versions, at least by extracting a
common interface.
Merge pull request #8 from thehyve/master

Revert delete of PostgresI2b2HelperService