Created edem.group.member.join
Merge branch 'refactor'

Conflicts:
	custom.cfg