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