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