Fix config file for TinyMCE 4
Merge pull request #87 from rbngzlv/master

Fix Travis CI badge for master branch
Merge pull request #89 from rbngzlv/fix/tinymce-4-config-file-master

Fix config file for TinyMCE 4
Merge pull request #1 from spree-contrib/master

Update master from upstream