trying to pull
Merge branch 'master' of https://github.com/TeMaVa/Annotator

Conflicts:
	DnnServerClass2.py
	SendData.py
Merge branch 'master' of https://github.com/TeMaVa/Annotator
merge
Merge branch 'master' of https://github.com/TeMaVa/Annotator

Conflicts:
	DnnServerClass2.py
Merge branch 'master' of https://github.com/TeMaVa/Annotator
Merge branch 'master' of https://github.com/TeMaVa/Annotator

Conflicts:
	SendData.py
asd
autonetwrapper
Merge branch 'master' of https://github.com/TeMaVa/Annotator