Merge branch '2.1-Dec-29' of https://github.com/kaltura/mwEmbed into 2.1-Dec-29

Conflicts:
	includes/DefaultSettings.php
Merge branch '2.1-Dec-29' of https://github.com/kaltura/mwEmbed into 2.1-Dec-29

Conflicts:
	includes/DefaultSettings.php