model
Merge branch 'master' into develop

Conflicts:
	app/models/artist.rb
	db/schema.rb
	test/fixtures/artists.yml
	test/fixtures/users.yml