changes by JZ,RJ to plotting with mpl
Merge remote-tracking branch 'origin/master'

Conflicts:
	XTSMserver.py
	testing.py