added eclipse files to gitignore
added eclipse files to gitignore - one more time
Merge branch 'master' of github.com:transmart/transmart-core-api
Merge remote-tracking branch 'upstream/master'
From thehyve/transmart-core-api
Merge branch thehyve/master into transmart/master
Merge branch thehyve/master into transmart/master
Merge pull request #1 from thehyve/master

Sync with thehyve/master; new high dim API
Merge thehyve/master into transmart/master
Merge remote-tracking branch 'hyve/master' post-hackathon
Add branch suffix to version
Merge thehyve/master into london_hackaton
Merge pull request #2 from thehyve/london_hackaton

Merge thehyve/master changes after April (London Hackaton)
Merge branch 'london_hackaton' of github.com:transmart/transmart-core-api into london_hackaton
Merge pull request #3 from thehyve/london_hackaton

Rename name field to id one in Study
updated .gitignore to include standard Eclipse-generated files
updated version to 1.2.0 in preperation for release
Merge branch 'master' into testmerge

Conflicts:
	.gitignore
update version number to 2.2.1-SNAPSHOT - setup for bigfixes
Oops. update version number to 1.2.1-SNAPSHOT - setup for bigfixes
fixed the update to version number to 1.2.1-SNAPSHOT - setup for bugfixes