Added Edit Annotation Activity
Merge branch 'master' of github.com:CMPUT301F13T01/CreateYourOwnAdventure