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

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

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

Conflicts:
	SendData.py
pylearn2 verkko lisätty, base64 muutoksia