fix the class cast xception
Merge branch 'branch_save_fieldmap' of https://github.com/digitalabs/IBPMiddleware into branch_save_fieldmap

Conflicts:
	src/main/java/org/generationcp/middleware/dao/dms/ExperimentPropertyDao.java