Revert "GCP-8113"

This reverts commit fc2e67ad2aecc9ee3c19cda5af8cabb58c22f43d.
GCP-8180
GCP-8256
GCP-8046
GCP-8307
GCP-8307
GCP-8277
GCP-8323 Fix ordering of list entries when dragging lists to Build New List table
Fix for the General Trait Class
code merging of the required codes for the release
code merging of the required codes for the release
Merge branch 'branch_release_20140410'

Conflicts:
	src/main/java/org/generationcp/middleware/manager/GenotypicDataManagerImpl.java
	src/main/java/org/generationcp/middleware/operation/builder/TermBuilder.java
	src/main/java/org/generationcp/middleware/pojos/gdms/MappingPop.java
	src/main/java/org/generationcp/middleware/service/DataImportServiceImpl.java
	src/test/java/org/generationcp/middleware/manager/test/TestGenotypicDataManagerImpl.java
	src/test/java/org/generationcp/middleware/manager/test/TestGenotypicDataManagerImplUploadFunctions.java
	src/test/java/org/generationcp/middleware/manager/test/TestGermplasmListManagerImpl.java
	src/test/java/org/generationcp/middleware/manager/test/TestStudyDataManagerImpl.java
	src/test/java/org/generationcp/middleware/service/test/TestOntologyServiceImpl.java