Merge pull request #74 from CMPUT301F13T05/testing

Testing
Added existing photo option
Merge pull request #75 from CMPUT301F13T05/testing

Testing
added existing choice
added existing image adding
added comments to activities
fixed story view button clipping via XML
fixed edited by, fixed user displays
Bin file conflicts
Annotations partially working