set notes
core update
Merge branch 'master' of https://github.com/chewnoill/core_backend.git

Conflicts:
	corebackend/ConnectionManager.py
	corebackend/trax.py