Merge branch 'common-toplevel' into merge-all

Conflicts:
	.gitignore
	flashproxy-reg-email
	flashproxy-reg-http
	flashproxy-reg-url
Merge branch 'versioneer' into merge-all

Conflicts:
	common/flashproxy/__init__.py
Merge branch 'merge-next' into merge-all

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