Working state, still got lots of debug stuff to clean up
Nothing changed
Merge branch 'talktoserver' into threading

Conflicts:
	devices.py