code clean-up
Merge branch 'master' of https://github.com/digitalabs/BreedingManager

Conflicts:
	src/main/java/org/generationcp/breeding/manager/crosses/NurseryTemplateConditionsComponent.java
	src/main/java/org/generationcp/breeding/manager/crosses/NurseryTemplateMain.java
	src/main/java/org/generationcp/breeding/manager/crossingmanager/AdditionalDetailsBreedingMethodComponent.java
Merge branch 'master' of https://github.com/digitalabs/BreedingManager