Added medialemenent.js (demo and media dirs to be removed on merge)
Merge remote-tracking branch 'upstream/mediaelement-test'
Merge remote-tracking branch 'upstream/master'
Spanish translation
Bad merge fix
Merge pull request #23 from solispauwels/master

Spanish translation