Merge branch 'user_labels' of github.com:purple-martins-2013/storyward
Merge branch 'master' of github.com:purple-martins-2013/storyward
use serverside sanitization of html to prevent JS from parsing in JSON maliciously
use serverside sanitization of html to prevent JS from parsing in JSON maliciously
resolve merge conflict
Merge pull request #39 from purple-martins-2013/sanitize_on_backend

Sanitize HTML on backend