GCP-4744 refactored NumericTraits logic to separate class
Merge branch 'master' of https://github.com/digitalabs/GermplasmStudyBrowser

Conflicts:
	src/main/java/org/generationcp/browser/cross/study/adapted/main/SetUpTraitFilter.java
	src/main/java/org/generationcp/browser/cross/study/adapted/main/listeners/AdaptedGermplasmButtonClickListener.java