fixed the tests, things are passing except for anything to do with publishing and media (waiting for front end to add takePhoto)
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard