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

Conflicts:
	src/main/java/org/generationcp/middleware/manager/StudyDataManagerImpl.java