Revert 3348983..3cc85b4

This rolls back to commit 33489838f2c2867c5559581ab89bf38f6482995b.
cached_artists_count, user_type
Merge branch 'before_break' into fix_id_cache

Conflicts:
	app/models/artist.rb
	app/models/asset.rb
	app/models/asset_detail.rb
	app/models/asset_digest.rb
	app/models/period.rb
	app/models/user.rb