asd
Merge branch 'master' of https://github.com/TeMaVa/Annotator

Conflicts:
	DnnServer.py
asd