Merge branch 'master' into FEC-418_metadataProfileId_support

Conflicts:
	modules/KalturaSupport/tests/CustomMetaData.html
fix vPAID test page
Added crossdomain.xml for player.kaltura.com demos.
Merge branch 'master' of https://github.com/kaltura/mwEmbed.git
Stubs for editing player JSON, not added; currently clears out xml :(
Remove non-digit values when making version comparisons
Merge pull request #477 from kaltura/FEC-418_metadataProfileId_support

FEC-418 metadataProfileId support - merge to jsonConfig + master
fix conflicts