Merge branch 'feature-belongstomany-mixed-data' of github.com:cjquinn/cakephp into feature-belongstomany-mixed-data

Conflicts:
	src/ORM/Marshaller.php
	tests/TestCase/ORM/MarshallerTest.php