Renamed group to role.
Merge branch 'test' into role-rename

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/role-new.js
	app/views/roles.html
	dist/views/partials/configs/users_roles.html
Merge