Merge remote-tracking branch 'origin/master'

Conflicts:
	app/view/Users/UsersGrid.js
	app/view/group/GroupDetail.js