Delete proto02
improvd documentation.
Merge branch 'master' into DeveloPageView
Experiment.
PageEditView Done.
Merge remote-tracking branch 'origin/DeveloPageView'

Conflicts:
	AdventureStoryFinal/src/edu/ualberta/adventstory/ActivityExtended.java
	AdventureStoryFinal/src/edu/ualberta/adventstory/StartActivity.java
	AdventureStoryFinal/src/edu/ualberta/multimedia/MultimediaAbstract.java
	AdventureStoryFinal/src/edu/ualberta/multimedia/Picture.java
	AdventureStoryFinal/src/edu/ualberta/multimedia/SoundClip.java
	AdventureStoryFinal/src/edu/ualberta/multimedia/Video.java
Merge branch 'master' of
https://github.com/CMPUT301F13T07/Team07Story.git

Conflicts:
	AdventureStoryFinal/src/edu/ualberta/adventstory/ActivityExtended.java
	AdventureStoryFinal/src/edu/ualberta/utils/Content.java