Merge pull request #19 from broadinstitute/BUS-83-consent-updates

BUS-83: Fixes #16
Merge pull request #20 from broadinstitute/BUS-83-consent-updates

Fixes #14
Merge pull request #23 from broadinstitute/BUS-83-consent-updates

Bus 83 consent updates
Merge pull request #25 from broadinstitute/BUS-83-consent-updates

Fixes #24
Merge pull request #28 from broadinstitute/BUS-83-consent-updates

Allow for multiple IC letters. 
Refer to DU and IC as Data Use and Initial Consent throughout
Merge pull request #30 from broadinstitute/BUS-83-consent-updates

Fixes #22
Merge pull request #31 from broadinstitute/BUS-83-consent-updates

Fixes #13 by applying post-chosen-application css modification.
Merge pull request #33 from broadinstitute/BUS-83-consent-updates

Fix #32
Merge pull request #46 from broadinstitute/BUS-83-consent-updates

Update linked collection labeling text.
Merge pull request #52 from broadinstitute/master

Sync qa with master release.
Merge pull request #54 from broadinstitute/master

Sync with latest master
Merge pull request #56 from broadinstitute/master

Sync qa with master release.
Merge branch 'master' into qa
Fixes #18. First pass at amendment infrastructure.

Fixes #18. First round for implementation of amendments and migration for existing amendments.
Merge pull request #59 from broadinstitute/amendments_new

Amendments
Merge pull request #61 from broadinstitute/master

Merge from Master
Merge branch 'post-release-fixes' into qa
Merge remote-tracking branch 'origin/qa' into qa
Merge pull request #71 from broadinstitute/consent_group_edit_bug

Consent group edit bug
Merge branch 'api-integration' into qa

Conflicts:
	grails-app/conf/BuildConfig.groovy
	orsp-grailsPlugins.iml
	orsp.iml