Merge pull request #1 from MarekKowalski/master

Update from upstream.

.gitignore

@@ -19,7 +19,6 @@ x64/
 x86/
 build/
 bld/
-[Bb]in/
 [Oo]bj/
 
 # Visual Studo 2015 cache/options directory

LiveScanServer/OpenGLWindow.cs

@@ -259,7 +259,7 @@ namespace KinectServer
             if ((DateTime.Now - tFPSUpdateTimer).Seconds >= 1)
             {
                 double FPS = nTickCounter / (DateTime.Now - tFPSUpdateTimer).TotalSeconds;
-                //this.Title = "FPS: " + string.Format("{0:F}", FPS);
+                this.Title = "FPS: " + string.Format("{0:F}", FPS);
 
                 tFPSUpdateTimer = DateTime.Now;
                 nTickCounter = 0;

src/LiveScanClient/marker.cpp

@@ -77,9 +77,8 @@ bool MarkerDetector::GetMarker(cv::Mat &img, MarkerInfo &marker)
 				order = false;
 			}
 
-			float test = cornersFloat[0].x - cornersFloat[1].x;
-
-			CornersSubPix(cornersFloat, contours[i], order);
+			//I have commented this out as it crashed for some people, if you want additional accuracy in calibration try to uncomment it.
+			//CornersSubPix(cornersFloat, contours[i], order);
 
 			vector<Point2f> cornersFloat2(nMarkerCorners);
 			vector<Point3f> points3D;