GCP-8620
Merge branch 'master' of https://github.com/digitalabs/BreedingManager

Conflicts:

src/main/java/org/generationcp/breeding/manager/listmanager/sidebyside/L
istManagerMain.java