GCP-8440
Merge branch 'branch_release_20140410' of github.com:digitalabs/GermplasmStudyBrowser into branch_release_20140410
GCP-8358 c/o ate jai
GCP-8518
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/GermplasmStudyBrowser

Conflicts:
	src/main/webapp/VAADIN/themes/gcp-default/styles.css