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

Conflicts:
	src/main/java/org/generationcp/middleware/service/FieldbookServiceImpl.java
	src/main/java/org/generationcp/middleware/service/api/FieldbookService.java