Fixed some toolbar and edit bugs
Merge branch 'master' of https://github.com/StanfordHCI/story-collab