Fixed conflicts in TestViewPageActivity, and tweaked other tests as well.
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
Merge pull request #144 from KarlParkinson/unitTestBranch

Fixed conflicts in TestViewPageActivity, and tweaked other tests as well...