Refactored group functionality.
Refactored.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	client/views/projects/project_edit.js
.