GCP-8150
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/BreedingManager into branch_release_20140410

Conflicts:
	src/main/java/org/generationcp/breeding/manager/crossingmanager/CrossingManagerListTreeComponent.java
	src/main/java/org/generationcp/breeding/manager/customfields/ListTreeComponent.java
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/BreedingManager into branch_release_20140410