schema migration
Merge branch 'master' into upload-photo

Conflicts:
	db/schema.rb