fixed relative directories in control
Merge branch 'greg'

Conflicts:
	Code/ActiveLightingControl.py