Make one migration less sensitive to errors
Merge branch 'master' into mig_fix

Conflicts:
	db/structure.sql
Merge pull request #406 from sharetribe/mig_fix

Make one migration less sensitive to errors