Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
Merge branch 'KimWork'
changes
Changed refresh to resume
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
Added the on resume stuff
 hanges 2
addChapter changes
Made some awful changes to ViewBrowseStories
Heavily modified storyhoard view story activity
Added thenecessary xml, the custom adapter
Got images working for browse stories
Linked adding story to browse all stories
Added the various story types. Added some garbage test data.
updates to the class diagram
fixing some documentation in the backend unit tests
working on tests for general controller
got a few tests passing for the general controller, but not all