Merge pull request #194 from solispauwels/master

Change tinymce.activeEditor when click in resource picker
Merge remote-tracking branch 'upstream/master'