commit naoserver
commit facerec
Merge branch 'master' of https://github.com/petrind/SRTesis2

Conflicts:
	Projects/FaceRecProOV/FaceRecProOV/FrameShooterDistance.cs
	Projects/FaceRecProOV/FaceRecProOV/MultiFaceRec.suo
	Projects/FaceRecProOV/FaceRecProOV/PointDetector.cs
	Projects/NAOServer2/NAOServer2.suo
	Projects/NAOServer2/NAOServer2/obj/x86/Debug/MainWindow.baml
	Projects/NAOServer2/NAOServer2/obj/x86/Debug/NAOServer2.g.resources