Form group
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js-dist/moeui.min.js