Merge branch 'softreorg' into develop

Conflicts:
	lib/config.py