Merge 1.3+

Conflicts:
	RoameBot.exe
1.3 hotfix

Conflicts:
	RoameBot.exe