Server ack error fixed
Merge branch 'master' into zac

Conflicts:
	Server_Project_With_GUI.py
Merge branch 'master' of https://github.com/pacohojaverde/adHocBoeBot.git