- Editors
Merge remote-tracking branch 'ccantill/master' into editing

Conflicts:
	web/extensions/grouping.js
Merge pull request #12 from SamDeBlock/editing

Editing