Fixed some annotation stuff
Merge branch 'master' of https://github.com/CMPUT301F13T14/Team14StoryBuilder.git