some fix
fix for button rendering and controller methods
allows for groups somewhat
Merge branch 'cleancontroller' into mergeforstines
Merge remote-tracking branch 'origin/mergetest2' into mergeforstines
Merge branch 'mergeforstines'
remove heads
Merge branch 'master' of https://github.com/191-Group-4/partner

Conflicts:
	app/controllers/users_controller.rb