LR-2: Link together two spaces (still need tests)
Merge branch 'master' into 'spaces'

Conflicts:
	constants.py
	space.py