Merge branch 'master'

Conflicts:
	RoameBot.exe
	RoameBot.py
Merge branch 'master'

Conflicts:
	RoameBot.exe
	RoameBot.py