<#
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
Added AnnotationListActivity
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
AnnotationListActivity
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git
Set up launching AnnotationListActivity from FragmentViewActivity.
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git