Rename some columns in schema
Change entities to eager loading, cascade to merge/persist and add a named query for staffcounts by activitytype
Update test, add service test skeleton
Add view beans, to be used by service layer
Adding methods to dao to facilitate service methods
Small changes to view to test service layer