More changes
Merge branch 'development'

Conflicts:
	spaceplandata.py
	spaceplandata.pyc
	spaceplanning.py