Merge branch 'fac-build'

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