fix for Safari to play video on HTTPS site
Merge branch 'master' of https://github.com/benroy73/mediaelement into benroy73-master

Conflicts:
	build/mediaelement-and-player.js
	build/mediaelement-and-player.min.js
	build/mediaelement.js
	build/mediaelement.min.js
	src/js/me-shim.js
merge