-	Group button custom directive.
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/modules/roles/controllers/roles.client.controller.js