Merge pull request #126 from aztec8/master

end of week merge for last week, this week
changed the way upload_media.json returned errors
Merge pull request #129 from thequbit/master

changed the way upload_media.json returned errors
fixed up some debug stuff and added collections support
Merge pull request #133 from thequbit/master

fixed up some debug stuff and added collections support
moved get_client_logs to admin side, and modified fields for publish_post.json for consistancy
Merge pull request #134 from aztec8/master

EOD with Tim - aug 26
changing things around with tokens.  also implementing admin/get_my_assignments.json (untested)
started automated tests
cleaned up some debug stuff
updated blank database
14 tests implmeneted, and 2 large bugs found and fixed.  woohoo!
Merge pull request #136 from thequbit/master

added test suite, and made changes based on test results.
updateing src/server
code tweaks. back talking to the server properly. points