rebase
Merge branch 'master' of https://github.com/frankpepermans/dorm
d9b5beaef36eb9b3d7e74eb7a6c30cc9bd09fdb3.

Conflicts:
	test/dorm_entity_spawn_test.dart