Added medialemenent.js (demo and media dirs to be removed on merge)
jquery 2
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/mediaelement-test'
Merge pull request #21 from solispauwels/master

jquery2
Merge pull request #22 from ptsavdar/master

Added tinymce plugins, mention and accordion
Merge remote-tracking branch 'upstream/master'
Spanish translation
Bad merge fix
Merge pull request #23 from solispauwels/master

Spanish translation