*SearchPage.jsp:Fixed issue where clicking on Search button would cause no selection pop up to appear which would block the search
Merge branch 'master' into Spring
Bug fix for Search boxes in Search.jsps
Adding SPCMeasurement and SPCData classes to Persistence context