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
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
#83 changed all JUnit tests to run in new AndroidTest project
Updated TestViewPageActivity
Merge pull request #126 from moorej12/master

#114 Made ViewPageActivity MVC
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	gen/ca/ualberta/CMPUT301F13T02/chooseyouradventure/R.java
	res/values/strings.xml
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Story.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
dded timestampiing
Merge branch '83-JUnit-model' of https://github.com/klindenbach/301project into klindenbach-83-JUnit-model

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Comment.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Story.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
Merge branch 'master' of https://github.com/jcadek/301project into jcadek-master

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/elasticsearch/ESHandler.java
Fixed duplication bug
Wrote test for EditStoryActivity, TextTile, AudioTile, VideoTile, PhotoTile, ViewPageACtivity. Tests for AudioTile and VideoTile are not finished yet.
#83 Implemented tests for view stories activity
Merge pull request #133 from klindenbach/83-JUnit-model

#83 Implemented tests for view stories activity
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project
Created a Generator for a sample story