Bug fixes
Merge branch 'master' of https://github.com/omerpa/mwEmbed into AttracTV

Conflicts:
	modules/AttracTV/tests/AttracTV.qunit.html