Merge branch '82-JavaDoc' of https://github.com/klindenbach/301project into klindenbach-82-JavaDoc

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Merge branches 'jamesPull' and 'master'
ntermediate thing
Merge https://github.com/jcadek/301project into jamesPull
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Buggy stuff
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Working on Authoring
Unit Tests
Added Junit testing project, and changed ControllerApp
Merge branch 'unitTestBranch' of https://github.com/KarlParkinson/301project into unitTestBranch
Merge branch 'unitTestBranch' of https://github.com/KarlParkinson/301project into 83-JUnit-model
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
#83 changed all JUnit tests to run in new AndroidTest project
Updated TestViewPageActivity
Working on bugs
Fixed Bugs and Saving
Major MVC refactoring
Massive MVC update
Merge pull request #124 from tbendubois/#116_DuplicateESHandlerFunctionalityInDBHandler

#116 Added DBHandler implementation.