Page Editable
Merge branch 'master' of
https://github.com/CMPUT301F13T11/Team11AdventureBook.git

Conflicts:
	AdventureBook/src/c301/AdventureBook/EditPageActivity.java
Merge branch 'master' of
https://github.com/CMPUT301F13T11/Team11AdventureBook.git

Conflicts:
	AdventureBook/src/c301/AdventureBook/AnnotationActivity.java
	AdventureBook/src/c301/AdventureBook/CreateStoryActivity.java
	AdventureBook/src/c301/AdventureBook/EditOptionActivity.java
	AdventureBook/src/c301/AdventureBook/EditPageActivity.java
	AdventureBook/src/c301/AdventureBook/EditStoryActivity.java
	AdventureBook/src/c301/AdventureBook/Models/Option.java
	AdventureBook/src/c301/AdventureBook/Models/Page.java