Merge branch 'client-side-uuids' into working-master
Merge branch 'ajax-relations' into working-master

Conflicts:
	test/specs/model.relation.js