Delete proto02
improvd documentation.
Merge branch 'master' into DeveloPageView
Experiment.
PageEditView Done.
asdf
PageEdit fully working.
PageEdit fully working.
PageEditActivity fully working.
PageEditActivity fully working
Fixed my stupid commit.
Edited MultimediaAbstract and it's subclasses.
Merge branch '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
	AdventureStoryFinal/src/edu/ualberta/utils/Content.java
Fixed Conflicts
Merging.
Merged to DevelopPageEdit
Merge
MERGE
Merge
MERGE