fix these changes
Merge branch 'master' of https://github.com/zrivest/smart_groups
Merge branch 'master' of https://github.com/zrivest/smart_groups

Conflicts:
	config/routes.rb