Add pearlmillet to the list of crops.
Add Pearlmillet to the list of crops
fix issue
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware
GCP-8096
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware
getStudyType
added function to determine if a study is trial or nursery
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
GCP-8463
GCP-8461, GCP-8462
Upgraded javadoc plugin to newer version to get the new javadoc look. Configuration to only publish selected packages.
GCP-8470
Merge commit '42e5c5a39aa26f22eff77a2a1949df99a789ada6' into branch_gdms_v2.1