By rblanker: Fixed and improved the Drupal <-> MediaMosa sync code.
Updated CHANGELOG.
Merge branch 'master' of github.com:mediamosa/mediamosa-ck

Conflicts:
	CHANGELOG.txt