Build Spirit

Conflicts:
	envsetup.sh
	tools/roomservice.py