auth cleanup, role assignments and views
Merge branch 'collaborators'

Conflicts:
	db/seeds.rb