test publish subscribe
1
Merge branch 'master' of https://github.com/JavaanseHZ/presberry

Conflicts:
	src/gui/window.py
	src/gui/window.pyc
	src/http/server.py
	src/http/server.pyc