Made ViewPageActivity look nice
Merge branch 'master' of https://github.com/CMPUT301F13T02/301project

Conflicts:
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ControllerApp.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/Page.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewPageActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventure/ViewStoriesActivity.java
	src/ca/ualberta/CMPUT301F13T02/chooseyouradventuretest/TileGsonMarshalTest.java
Missed a conflict in last commit. Solved it.
Small changes to appearance and some code refactoring
Merge pull request #109 from moorej12/master

Made page viewing and editing look nice