Fixed JPA mappedBy reference to schoolEthnicityCount
Merge branch 'sandbox'