migrate after fetch
Resolve conflicts
Merge branch 'master' of github.com:enspiral/loomio
Merge remote-tracking branch 'origin'

Conflicts:
	db/schema.rb