GCP-8240
Merge remote-tracking branch 'remotes/origin/branch_release_20140410'

Conflicts:
	src/main/java/org/generationcp/middleware/manager/StudyDataManagerImpl.java
Merge remote-tracking branch 'remotes/origin/branch_release_20140410'

Conflicts:
	src/main/java/org/generationcp/middleware/manager/StudyDataManagerImpl.java
revert
Restore lost changes
GCP-8113
Merge remote-tracking branch 'origin/master'
GCP-8262
GCP-8116
GCP-8256
GCP-8180
GCP-8180