jquery spelling, comment on reusing the toolbar
Merge branch 'master' of https://github.com/jordandh/bootstrap-wysiwyg
error handler for unsupported types in upload