bugfixes
Merge branch 'master' into udp_connection

Conflicts:
	pytrak.py
	trakstar/trakstar_interface.py