Join group function
Merge branch 'master' of github.com:fm2munsh/due

Conflicts:
	app/controllers/groups_controller.rb