Updated TestViewPageActivity
Wrote test for EditStoryActivity, TextTile, AudioTile, VideoTile, PhotoTile, ViewPageACtivity. Tests for AudioTile and VideoTile are not finished yet.
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