Merge branches 'master' and 'searchBranch'
Searching now takes place in ViewStoriesActivity.
Refactoring, Phase 1
Refactoring, Phase 2: Split Controller into 3 controllers
Forgot to add new files
Extracted FightingView
Cleanup
Added new View Classes
Pulled all Dialogs out of ViewPageActivity
Made Dialog classes for other Activities
Refactoring
remove dead code
Merge pull request #223 from jcadek/master

Refactoring Branch begun.
Searching now works from ViewStoriesActivity
Most Unit Tests Passing
Pulled out some Photo functions
New Controller
Merge pull request #228 from jcadek/master

Camera and Comments pulled out, ViewPageActivity now ONLY 560 lines, including JavaDocs
refactoring continues
Merge commit https://github.com/jcadek/301project7f5148ab8ece3d93208ed58e900da53711e14142		branch 'Refactor' into Refactor