Catalog : generate plain text and HTTP response from catalog
Main : use catalog address and port to serve catalog
Merge branch 'master' of https://github.com/merlinND/DPyStream

Conflicts:
	helloSocket.py