Merge pull request #296 from solispauwels/master

Upload a file/picture directly to TinyMCE
Merge remote-tracking branch 'upstream/master'
requestStack update