Edited some tests to help mesh with new JSON format.
Commented User, UserTests, and re-named JSONPackager classes.
Merge remote-tracking branch 'origin/master'