added actual controllers for chapter story and choices, in progress of changing gui to use them
done making changes in activities, but now tests are all broken
got rid of old controller classes and SHController, now use manager classes or new conrtoller classes
bout half of tests fixed, and  lots of bugs due to the change fixed. app seems to be running without any problems
new controllers and their test files added
fixed addh choice, edit choice, illustrations (multiple and single), can now view all choices when viewing chapter, etc
fixed searching, was breaking when clicking on published story results
forgot file
Merge branch 'FixControllers' of https://github.com/CMPUT301F13T13/StoryHoard into FixControllers
overwrite dialog now happens only if theres a local copy of story on phone, and added dialog to search results activity
ashley and I have gone through all the user stories and use cases, everything seems to work. Commit changes of mcv redo attempt