Merge pull request #265 from jerv13/master

Added configuration for elfinder TinyMce plugin
Merge remote-tracking branch 'upstream/master'