working around pyinotify
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client.py
trying to fix temporary file issues