Added some basic tests, removed extraneous json methods
Merge branch 'generic-model' of https://github.com/slash-slash-no-comment-WPI-cs3733/wpi-suite into generic-model
Actually adding test class now
Finished activities, cleaned up according to CodePro
Adding header comment for entity manager
Created reports manager with some basic functionality
Added test methods for report manager
Synchronization fixes
Merging with code in generic model to simplify merge, I hope.
Updated tests--still experiencing workspace issues
Passes tests
Cleaned language on tests
Removing synchronization code
merge branch activities-reports-tomerge into dev-gradle
fix merge issues