Merge branch 'fac-build' into merge-all

Conflicts:
	Makefile
	doc/facilitator-howto.txt
	facilitator/Makefile
	websocket-transport/Makefile
Merge branch 'bug9349_server_urlparam' into merge-all

Conflicts:
	facilitator/Makefile
	facilitator/facilitator-test.py
	facilitator/init.d/facilitator.in