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

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
Updated TestViewPageActivity
Wrote test for EditStoryActivity, TextTile, AudioTile, VideoTile, PhotoTile, ViewPageACtivity. Tests for AudioTile and VideoTile are not finished yet.
Merge pull request #132 from jcadek/master

Fixed duplication bug, Added a Generator for an example story.
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into unitTestBranch

Conflicts:
	ChooseYourAdventureTest/src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/test/TestViewPageActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/AudioTile.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/PhotoTile.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/VideoTile.java
Merge pull request #134 from KarlParkinson/unitTestBranch

Holy cow -- this is a lot of tests
Fixed issue with getting activity in main activity tests
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
#137 Expanded class java-docing to include fleshed out details and MVC role
#137 Added some TODOs to class JavaDocs
Converted DBHandler unit tests to new format
#70 Added licenses to files missing a license
added license to xml files
Merge pull request #140 from klindenbach/137-JavaDoc-Class-Patterns

137 java doc class patterns
Merge pull request #142 from klindenbach/70-license-headers

#70 license headers
Fixed conflicts in TestViewPageActivity, and tweaked other tests as well.
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	ChooseYourAdventureTest/src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/test/DBHandlerTest.java
	ChooseYourAdventureTest/src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/test/TestViewPageActivity.java
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project into unitTestBranch

Conflicts:
	ChooseYourAdventureTest/src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/test/TestViewPageActivity.java
Shouldn't be any conflicts