added the new java files
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