Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware

Conflicts:
	src/main/java/org/generationcp/middleware/dao/dms/StudySearchDao.java
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware