Merge branch 'groups' of github.com:MeterSoft/my_net into groups

Conflicts:
	app/controllers/groups_controller.rb
	app/views/groups/_index_group.html.slim
	app/views/groups/index.html.slim