Merge branch 'development'

Conflicts:
	db/schema.rb