Groups
Merge branch 'master' of https://github.com/agustincl/anguilaperro

Conflicts:
	application/views/users/index.phtml
Gropups, Users