add working state top master
Merge branch 'master' into dev

Conflicts:
	PyDC/PyDC/configs.py
	PyDC/PyDC/tests.py