rerouted user registration to group registraion
Merge branch 'master' into mybranch

Conflicts:
	db/schema.rb
	db/seeds.rb