GCP-7958
GCP-8205
GCP-8173
GCP-8116
GCP-8116
Checking in my envConfig.
GCP-8240
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/IBPMiddleware into branch_release_20140410
GCP-8240
fix compile issues
GCP-8240
GCP-8113
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'
Merge remote-tracking branch 'origin/master' into branch_properties_file

Conflicts:
	src/main/java/org/generationcp/middleware/domain/oms/TermId.java