Merging PageEditView and updated Multimedia classes.
Testing started.
Some fix
Merging Process
Merge PageEditActivity and PageViewActivity
Merge PageEditActivity
Merge branch 'master' of https://github.com/CMPUT301F13T07/Team07Story