merged changes
Merge branch 'master' of https://github.com/kaltura/server

Conflicts:
	alpha/config/schema-transformed.xml