fix ORM, add promises
Merge remote-tracking branch 'origin/feature-orm' into feature-orm

Conflicts:
	server/services/orm.js