Merge branch 'master' of https://github.com/thehyve/transmart-rest-api
Merge branch 'master' of https://github.com/thehyve/transmart-rest-api
Merge branch 'master' into features/CHERKASY-implement-api-calls
[CHERKASY-51] Convert transmart-rest-api to grails plugin
Merge branch 'features/CHERKASY-implement-api-calls' into features/CHERKASY-51-convert-rest-api-to-plugin

Conflicts:
	grails-app/conf/spring/resources.groovy
[CHERKASY-51] Remove redundant declaration
Fix test PatientMarshallerTests.testHal
[CHERKASY-51] Remove oauth confirm page

I overlooked this file during oauth functionality removal
Merge branch 'features/CHERKASY-51-convert-rest-api-to-plugin' of https://github.com/thehyve/transmart-rest-api into features/CHERKASY-51-convert-rest-api-to-plugin
Implements first version of observation calls.

* /studies/observations
* /studies/subjects/observations

No tests yet...
[CHERKASY-51] Add grails release plugin

To be able to publish rest api plugin to maven repo
[CHERKASY-51] Upgrade grails rest api version (fixed one)
[CHERKASY-51] Convert to snapshot version
Merge branch 'features/CHERKASY-implement-api-calls' of https://github.com/thehyve/transmart-rest-api into features/CHERKASY-implement-api-calls

Conflicts:
	grails-app/conf/UrlMappings.groovy
Force initialization of marshallers registrar from plug-in
Merge pull request #5 from thehyve/issues/CHERKASY-marshalers-plugin-initialization

Force initialization of marshallers registrar from plug-in
CHERKASY-58 CHERKASY-59
-implementation of /studies/<studyId>/concepts
-implementation of /studies/<studyId>/concepts/<conceptId>
-url mappings with <conceptId> adjusted to they work with concept paths as conceptIds
Merge branch 'features/CHERKASY-implement-api-calls' of github.com:thehyve/transmart-rest-api into features/CHERKASY-implement-api-calls
CHERKASY-58 CHERKASY-59
-Both JSON and HAL are now properly rendered
-adding example/verifyRestCalls.groovy to verify the REST calls (for localhost with test data)
CHERKASY-58 CHERKASY-59 REST API calls for concepts
-created abstract ResourceTestCase for testing both JSON or HAL formats
-added ConceptsResourceTests for testing concept index and show, both JSON and HAL