Revert "Merge branch 'master' into 'origin/aura'"

.idea/comba.iml

.idea/misc.xml

.idea/modules.xml

.idea/vcs.xml

.idea/workspace.xml

clientapi/python/__pycache__/combaclient.cpython-35.pyc

clientapi/python/__pycache__/zmqadapter.cpython-35.pyc

clientapi/python/combaclient.py

clientapi/python/tcpadapter.py

clientapi/python/zmqadapter.py

combaa.py

combac.py

combam.py

combas.py

combaweb.py

libraries/base/__pycache__/combabase.cpython-35.pyc

libraries/base/__pycache__/schedulerconfig.cpython-35.pyc

libraries/base/combabase.py

libraries/base/schedulerconfig.py

libraries/database/__pycache__/broadcasts.cpython-35.pyc