message function

messages
Merge remote-tracking branch 'origin/master'

Conflicts:
	bot-group-edit.py