adding + loading + getting all media tests now pass
tests for media manager all pass
unit test for media updated, but waiting for takePhoto functionality to go up to test converting uri to bitmap
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
Merge branch 'AlexModifications'
Merge branch 'AlexModifications'
added methods to servermanager interface, and tests for the general controller dealing with media.
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
added methods to add media to a chapter
added junit test for testing out server related things
updates to class diagram
added SimpleESResponse, Hits, ElasticSearchResponse, working on the server framework
added the new java files
deleted redundant method in storymanager (getpublishedstories), added tests for the server handling
commented out lines in ESClient that are showig up as errors for unknown reason
fixed merge conflicts
added Junit to third party libraries
documentation for some of the back end classes
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into BuildingServer