renamed ViewStoryActivity to StorySettingsActivity
update media table in db
more methods in the media class
change type to string in media db
media class done, here you go Ashley
fixed the switch up in the getter and setter for id
media manager
update choice in db contract
took out story id from choice, choicemanager, and general controller
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
change story search criteria
updated test
changed array list type of of photos and illus to media objects
finished up media stuff in general controller, working on the tests for it
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
changes to general controller (dealing with media)
changed min and target api level to match the storyhoard project
some changes to unit test classes, although main activity is not able to be resolved
updated to unit tests. chapter, chapter manager, choice, story, story manager work
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard into KimWork