Converted DBHandler unit tests to new format
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

Conflicts:
	ChooseYourAdventureTest/src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/test/TestViewPageActivity.java
Merge pull request #141 from klindenbach/master

Converted DBHandler tests to new format