GCP-8292
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/GermplasmStudyBrowser into branch_release_20140410