Annotations are displayed with author tag and optional captions; saves and loads correctly.. HOORAY
Merge branch 'master' of https://github.com/CMPUT301F13T06/ClassProject
don't show recoder button if recording already done
Merge branch 'master' of github.com:CMPUT301F13T06/ClassProject into videoPlayback
VideoIllustration ImageButton now shows a play button on a black background