Quote some pgsql commands
Merge branch 'feature/uuid' into feature/cloud

Conflicts:
	app/models/user.rb