--- a/mac/Tools.xcodeproj/project.pbxproj
+++ b/mac/Tools.xcodeproj/project.pbxproj
@@ -7,59 +7,71 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		43352EC2171351D700889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352EC0171351D700889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; };
-		43352EC3171351D700889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352EC1171351D700889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; };
-		43352EC4171351ED00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352EC0171351D700889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */; };
-		43352EC5171351F100889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43352EC1171351D700889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */; };
+		433D9043183DF78700F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D9055183EC12F00F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D9057183EC15400F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D9058183EC15400F90A31 /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C61829B33900389F1B /* libboost_thread.dylib */; };
+		433D905B183EC16F00F90A31 /* libexiv2.12.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D9059183EC16F00F90A31 /* libexiv2.12.dylib */; };
+		433D905C183EC16F00F90A31 /* libtiff.5.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D905A183EC16F00F90A31 /* libtiff.5.dylib */; };
+		433D905D183EC1AA00F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D905F183EC1AB00F90A31 /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D905E183EC1AB00F90A31 /* libboost_regex.dylib */; };
+		433D9063183EC1CF00F90A31 /* libwx_osx_cocoau_gl-3.0.0.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D9061183EC1CF00F90A31 /* libwx_osx_cocoau_gl-3.0.0.0.0.dylib */; };
+		433D9064183EC1CF00F90A31 /* libwx_osx_cocoau-3.0.0.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D9062183EC1CF00F90A31 /* libwx_osx_cocoau-3.0.0.0.0.dylib */; };
+		433D9065183EC1F700F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D9067183EC21400F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D9068183EC21400F90A31 /* libtiff.5.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D905A183EC16F00F90A31 /* libtiff.5.dylib */; };
+		433D9069183EC23000F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D906B183EC24D00F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D906F183EC2A200F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D9072183EC2A200F90A31 /* libGLEW.1.10.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D9071183EC2A200F90A31 /* libGLEW.1.10.0.dylib */; };
+		433D9073183EC2B700F90A31 /* libtiff.5.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D905A183EC16F00F90A31 /* libtiff.5.dylib */; };
+		433D9076183EC31600F90A31 /* libboost_regex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D905E183EC1AB00F90A31 /* libboost_regex.dylib */; };
+		433D9077183EC31600F90A31 /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		433D9079183EC3D100F90A31 /* liblevmar.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 433D9078183EC3D100F90A31 /* liblevmar.dylib */; };
+		436BB9C81829B33900389F1B /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
+		436BB9C91829B33900389F1B /* libboost_thread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C61829B33900389F1B /* libboost_thread.dylib */; };
+		436BB9D1182A16F700389F1B /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 436BB9C51829B33900389F1B /* libboost_system.dylib */; };
 		43760E5017064FFB00ED2679 /* geocpset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760E4F17064FFB00ED2679 /* geocpset.cpp */; };
 		43760E5F1706503100ED2679 /* pto_var.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760E5E1706503100ED2679 /* pto_var.cpp */; };
 		43760E6E1706506C00ED2679 /* pto_lensstack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760E6D1706506C00ED2679 /* pto_lensstack.cpp */; };
-		43760EBC17065E4500ED2679 /* libHalf.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EBA17065E4500ED2679 /* libHalf.7.dylib */; };
-		43760EBD17065E4500ED2679 /* libIlmImf.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EBB17065E4500ED2679 /* libIlmImf.7.dylib */; };
-		43760EC317065F0D00ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43760EC417065F0D00ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43760ECB17065F3000ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43760ECC17065F3000ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43760ED117065F4900ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43760ED217065F4900ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43760EDF170662ED00ED2679 /* ParseExp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760EDE170662ED00ED2679 /* ParseExp.cpp */; };
-		43760EF11707070500ED2679 /* libGLEW.1.9.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF01707070500ED2679 /* libGLEW.1.9.0.dylib */; };
-		43760EF41707072C00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760EF5170707B500ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760EF7170707DE00ED2679 /* libexiv2.12.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF6170707DE00ED2679 /* libexiv2.12.dylib */; };
-		43760F141707155E00ED2679 /* libbase_wx-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA358D1705073500D165A4 /* libbase_wx-2013.0.dylib */; };
-		43760F171707157200ED2679 /* libicpfind-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA36FA1705757D00D165A4 /* libicpfind-2013.0.dylib */; };
-		43760F1E1707187D00ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43760F231707189F00ED2679 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43760F24170718A900ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760F25170718BE00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760F2B170744C700ED2679 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F2A170744C700ED2679 /* libtiff.3.dylib */; };
-		43760F2C170744DB00ED2679 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F2A170744C700ED2679 /* libtiff.3.dylib */; };
-		43760F2D170744F100ED2679 /* libtiff.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760F2A170744C700ED2679 /* libtiff.3.dylib */; };
-		43760F2E170746E600ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760F2F170746F700ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760F301707470A00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760F311707471C00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760F321707473000ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760F331707473F00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760F341707475000ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		43760F351707479E00ED2679 /* libpano13.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43760EF31707072C00ED2679 /* libpano13.2.dylib */; };
-		4376108517077F1E00ED2679 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		4376108817077F6500ED2679 /* libboost_thread-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108217077F1E00ED2679 /* libboost_thread-1_46.dylib */; };
-		4376108917077F6A00ED2679 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		4376108B17077F7A00ED2679 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		4376108C17077F7E00ED2679 /* libboost_thread-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108217077F1E00ED2679 /* libboost_thread-1_46.dylib */; };
-		4376108D17077F9900ED2679 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		4376108E17077FC000ED2679 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		4376108F17077FD700ED2679 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		4376109017077FEA00ED2679 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
+		43760EC317065F0D00ED2679 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43760EC417065F0D00ED2679 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43760ECB17065F3000ED2679 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43760ECC17065F3000ED2679 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43760ED117065F4900ED2679 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43760ED217065F4900ED2679 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43760EDF170662ED00ED2679 /* ParseExp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43760EDE170662ED00ED2679 /* ParseExp.cpp */; settings = {COMPILER_FLAGS = "-ftemplate-depth-1024"; }; };
+		43760F171707157200ED2679 /* libicpfind-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA36FA1705757D00D165A4 /* libicpfind-2014.0.dylib */; };
+		43760F1E1707187D00ED2679 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43821143187B570D00DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		43821144187B572100DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		43821145187B573E00DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		43821146187B575400DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		43821149187B578000DB9A4D /* libHalf.11.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821147187B578000DB9A4D /* libHalf.11.dylib */; };
+		4382114A187B578000DB9A4D /* libIlmImf-Imf_2_1.21.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821148187B578000DB9A4D /* libIlmImf-Imf_2_1.21.dylib */; };
+		4382114B187B579600DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		4382114C187B57A900DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		4382114D187B57BE00DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		4382114E187B57D500DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		4382114F187B57E800DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		43821150187B57FC00DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		43821151187B581200DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		43821152187B5AC500DB9A4D /* libpano13.3.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */; };
+		43821161187B5B4200DB9A4D /* pto_mask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43821160187B5B4200DB9A4D /* pto_mask.cpp */; };
+		4382117D187B5BB000DB9A4D /* pto_move.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4382117C187B5BB000DB9A4D /* pto_move.cpp */; };
+		4382118C187B5C0F00DB9A4D /* pto_template.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4382118B187B5C0F00DB9A4D /* pto_template.cpp */; };
+		43821199187B5EBF00DB9A4D /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		4382119C187B5FA800DB9A4D /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		4382119F187B5FF400DB9A4D /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		438211A3187B69EA00DB9A4D /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 438211A2187B69EA00DB9A4D /* libboost_filesystem.dylib */; };
+		438211A5187BE12F00DB9A4D /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 438211A4187BE12F00DB9A4D /* libboost_system.dylib */; };
 		43A22C0D170E257300D5A7CC /* libzthread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 43A22C0C170E255A00D5A7CC /* libzthread.a */; };
 		43BA35901705075C00D165A4 /* align_image_stack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA358F1705075C00D165A4 /* align_image_stack.cpp */; };
-		43BA3591170507AF00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA3592170507AF00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
+		43BA3591170507AF00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA3592170507AF00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
 		43BA35A917056FE100D165A4 /* autooptimiser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA35A817056FE100D165A4 /* autooptimiser.cpp */; };
-		43BA35AE1705701B00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA35AF1705701B00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
+		43BA35AE1705701B00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA35AF1705701B00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
 		43BA36C2170572AC00D165A4 /* cpclean.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA36B61705727E00D165A4 /* cpclean.cpp */; };
 		43BA36C3170572C300D165A4 /* checkpto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA36B51705727E00D165A4 /* checkpto.cpp */; };
 		43BA36C4170572FC00D165A4 /* fulla.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA36B71705727E00D165A4 /* fulla.cpp */; };
@@ -81,68 +93,49 @@
 		43BA36E3170574F100D165A4 /* icpfind.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA36E2170574F100D165A4 /* icpfind.cpp */; };
 		43BA37031705759D00D165A4 /* deghosting_mask.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA36FC1705759D00D165A4 /* deghosting_mask.cpp */; };
 		43BA37041705759D00D165A4 /* deghosting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA36FD1705759D00D165A4 /* deghosting.cpp */; };
-		43BA370F170575DE00D165A4 /* APImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA3706170575DE00D165A4 /* APImage.cpp */; };
-		43BA3710170575DE00D165A4 /* Descriptor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA3708170575DE00D165A4 /* Descriptor.cpp */; };
-		43BA3711170575DE00D165A4 /* HessianDetector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA370B170575DE00D165A4 /* HessianDetector.cpp */; };
-		43BA3713170575DE00D165A4 /* MatchPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA370E170575DE00D165A4 /* MatchPoint.cpp */; };
-		43BA37191705777C00D165A4 /* Batch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA37151705777C00D165A4 /* Batch.cpp */; };
-		43BA371A1705777C00D165A4 /* ProjectArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA37161705777C00D165A4 /* ProjectArray.cpp */; };
-		43BA371B1705777C00D165A4 /* PTBatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA37171705777C00D165A4 /* PTBatcher.cpp */; };
-		43BA371C1705777C00D165A4 /* RunStitchFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA37181705777C00D165A4 /* RunStitchFrame.cpp */; };
-		43BA3721170577AC00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA3722170577AC00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA3727170577C600D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA3728170577C600D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA372B17057A2400D165A4 /* liblocalfeatures-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35891705073500D165A4 /* liblocalfeatures-2013.0.dylib */; };
-		43BA382B17057E4D00D165A4 /* libflann-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA358B1705073500D165A4 /* libflann-2013.0.dylib */; };
-		43BA383217057E9500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA383317057E9500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA383817057F1500D165A4 /* libceleste-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35871705073500D165A4 /* libceleste-2013.0.dylib */; };
+		43BA3721170577AC00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA3722170577AC00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA3727170577C600D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA3728170577C600D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA372B17057A2400D165A4 /* liblocalfeatures-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35891705073500D165A4 /* liblocalfeatures-2014.0.dylib */; };
+		43BA383217057E9500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA383317057E9500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA383817057F1500D165A4 /* libceleste-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35871705073500D165A4 /* libceleste-2014.0.dylib */; };
 		43BA383B17057FD400D165A4 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA383A17057FD400D165A4 /* CoreServices.framework */; };
-		43BA38421705803800D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA38431705803800D165A4 /* liblensdb-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357F1705073500D165A4 /* liblensdb-2013.0.dylib */; };
-		43BA38441705803800D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA384E1705815300D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA384F1705815300D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
+		43BA38421705803800D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA38431705803800D165A4 /* liblensdb-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357F1705073500D165A4 /* liblensdb-2014.0.dylib */; };
+		43BA38441705803800D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA384E1705815300D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA384F1705815300D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
 		43BA3850170581C900D165A4 /* deghosting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA36FD1705759D00D165A4 /* deghosting.cpp */; };
-		43BA385B17058A3500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA385C17058A3500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA386017058ADC00D165A4 /* liblines-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35851705073500D165A4 /* liblines-2013.0.dylib */; };
-		43BA386517058B6D00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA386617058B6D00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA386B17058BA000D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA386C17058BA000D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA387117058BB500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA387217058BB500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA387717058BF500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA387817058BF500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA387D17058C0C00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA387E17058C0C00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA388317058C2500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA388417058C2500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA388917058C4B00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA388A17058C4B00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA388F17058C6700D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA389017058C6700D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA389517058C8600D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA389617058C8600D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
-		43BA389B17058CA200D165A4 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43BA389C17058CA200D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
+		43BA385B17058A3500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA385C17058A3500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA386017058ADC00D165A4 /* liblines-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35851705073500D165A4 /* liblines-2014.0.dylib */; };
+		43BA386517058B6D00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA386617058B6D00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA386B17058BA000D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA386C17058BA000D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA387117058BB500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA387217058BB500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA387717058BF500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA387817058BF500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA387D17058C0C00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA387E17058C0C00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA388317058C2500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA388417058C2500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA388917058C4B00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA388A17058C4B00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA388F17058C6700D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA389017058C6700D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
+		43BA389B17058CA200D165A4 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43BA389C17058CA200D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
 		43BA389E17058CDE00D165A4 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA389D17058CDE00D165A4 /* OpenGL.framework */; };
 		43BA38A017058CE700D165A4 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA389F17058CE700D165A4 /* GLUT.framework */; };
-		43BA38A617058DB500D165A4 /* libmakefile-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35831705073500D165A4 /* libmakefile-2013.0.dylib */; };
-		43BA38AF17058E1A00D165A4 /* liblevmar-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357D1705073500D165A4 /* liblevmar-2013.0.dylib */; };
-		43D371271707817000B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		43D371281707818400B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		43D37129170781AD00B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		43D3712A170781B700B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
-		43D3712B170781BC00B3B844 /* libboost_regex-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108017077F1E00ED2679 /* libboost_regex-1_46.dylib */; };
-		43D3712C170781C600B3B844 /* libboost_regex-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108017077F1E00ED2679 /* libboost_regex-1_46.dylib */; };
-		43D3712D170781CA00B3B844 /* libboost_system-1_46.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */; };
+		43BA38A617058DB500D165A4 /* libmakefile-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35831705073500D165A4 /* libmakefile-2014.0.dylib */; };
 		43D37253170994E900B3B844 /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 43BA35BE1705706C00D165A4 /* Main.cpp */; };
-		43D3725A1709950A00B3B844 /* libceleste-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35871705073500D165A4 /* libceleste-2013.0.dylib */; };
-		43D3725B1709950A00B3B844 /* libhugin_base-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */; };
-		43D3725C1709950A00B3B844 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */; };
+		43D3725A1709950A00B3B844 /* libceleste-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35871705073500D165A4 /* libceleste-2014.0.dylib */; };
+		43D3725B1709950A00B3B844 /* libhugin_base-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */; };
+		43D3725C1709950A00B3B844 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -195,13 +188,6 @@
 			remoteGlobalIDString = 43BA32701703AE6200D165A4;
 			remoteInfo = hugin_base;
 		};
-		43760F121707155900ED2679 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 43BA35271704F90600D165A4;
-			remoteInfo = base_wx;
-		};
 		43760F151707156C00ED2679 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
@@ -216,7 +202,21 @@
 			remoteGlobalIDString = 43BA32701703AE6200D165A4;
 			remoteInfo = hugin_base;
 		};
-		43760F211707189B00ED2679 /* PBXContainerItemProxy */ = {
+		4382119A187B5F9800DB9A4D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 43BA32701703AE6200D165A4;
+			remoteInfo = hugin_base;
+		};
+		4382119D187B5FAE00DB9A4D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 43BA32701703AE6200D165A4;
+			remoteInfo = hugin_base;
+		};
+		438211A0187B5FF900DB9A4D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
 			proxyType = 1;
@@ -244,13 +244,6 @@
 			remoteGlobalIDString = 43BA31B71702E7D500D165A4;
 			remoteInfo = vigra_impex;
 		};
-		43BA357C1705073500D165A4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 43BA32301703A4F200D165A4;
-			remoteInfo = levmar;
-		};
 		43BA357E1705073500D165A4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
@@ -293,13 +286,6 @@
 			remoteGlobalIDString = 43BA349D1704F59500D165A4;
 			remoteInfo = localfeatures;
 		};
-		43BA358A1705073500D165A4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 43BA34D51704F65E00D165A4;
-			remoteInfo = flann;
-		};
 		43BA358C1705073500D165A4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
@@ -377,13 +363,6 @@
 			remoteGlobalIDString = 43BA349C1704F59500D165A4;
 			remoteInfo = localfeatures;
 		};
-		43BA382917057E4700D165A4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 43BA34D41704F65E00D165A4;
-			remoteInfo = flann;
-		};
 		43BA382E17057E8D00D165A4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
@@ -573,47 +552,26 @@
 			remoteGlobalIDString = 43BA32701703AE6200D165A4;
 			remoteInfo = hugin_base;
 		};
-		43BA389117058C7E00D165A4 /* PBXContainerItemProxy */ = {
+		43BA389717058C9A00D165A4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = 43BA31B61702E7D500D165A4;
 			remoteInfo = vigra_impex;
 		};
-		43BA389317058C7E00D165A4 /* PBXContainerItemProxy */ = {
+		43BA389917058C9A00D165A4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = 43BA32701703AE6200D165A4;
 			remoteInfo = hugin_base;
 		};
-		43BA389717058C9A00D165A4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 43BA31B61702E7D500D165A4;
-			remoteInfo = vigra_impex;
-		};
-		43BA389917058C9A00D165A4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 43BA32701703AE6200D165A4;
-			remoteInfo = hugin_base;
-		};
 		43BA38A717058DBB00D165A4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
 			proxyType = 1;
 			remoteGlobalIDString = 43BA32791703AED500D165A4;
 			remoteInfo = makefile;
-		};
-		43BA38AD17058E1400D165A4 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 43BA356A1705073500D165A4 /* Libraries.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 43BA322F1703A4F200D165A4;
-			remoteInfo = levmar;
 		};
 		43D3717E17079EC400B3B844 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -646,6 +604,33 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
+		43821155187B5B0100DB9A4D /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		43821171187B5B8300DB9A4D /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		43821180187B5BDD00DB9A4D /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
 		43D37248170994BF00B3B844 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -658,25 +643,37 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		43352EC0171351D700889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_osx_cocoau-2.9.3.0.0.dylib"; path = "../../External/repository/lib/libwx_osx_cocoau-2.9.3.0.0.dylib"; sourceTree = "<group>"; };
-		43352EC1171351D700889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_osx_cocoau_gl-2.9.3.0.0.dylib"; path = "../../External/repository/lib/libwx_osx_cocoau_gl-2.9.3.0.0.dylib"; sourceTree = "<group>"; };
+		433D904A183DF78700F90A31 /* libHalf.10.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libHalf.10.dylib; path = ../mac/ExternalPrograms/repository/lib/libHalf.10.dylib; sourceTree = "<group>"; };
+		433D904B183DF78700F90A31 /* libIlmImf-Imf_2_0.20.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libIlmImf-Imf_2_0.20.dylib"; path = "../mac/ExternalPrograms/repository/lib/libIlmImf-Imf_2_0.20.dylib"; sourceTree = "<group>"; };
+		433D9059183EC16F00F90A31 /* libexiv2.12.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libexiv2.12.dylib; path = ../mac/ExternalPrograms/repository/lib/libexiv2.12.dylib; sourceTree = "<group>"; };
+		433D905A183EC16F00F90A31 /* libtiff.5.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libtiff.5.dylib; path = ../mac/ExternalPrograms/repository/lib/libtiff.5.dylib; sourceTree = "<group>"; };
+		433D905E183EC1AB00F90A31 /* libboost_regex.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_regex.dylib; path = ../mac/ExternalPrograms/repository/lib/libboost_regex.dylib; sourceTree = "<group>"; };
+		433D9061183EC1CF00F90A31 /* libwx_osx_cocoau_gl-3.0.0.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_osx_cocoau_gl-3.0.0.0.0.dylib"; path = "../mac/ExternalPrograms/repository/lib/libwx_osx_cocoau_gl-3.0.0.0.0.dylib"; sourceTree = "<group>"; };
+		433D9062183EC1CF00F90A31 /* libwx_osx_cocoau-3.0.0.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libwx_osx_cocoau-3.0.0.0.0.dylib"; path = "../mac/ExternalPrograms/repository/lib/libwx_osx_cocoau-3.0.0.0.0.dylib"; sourceTree = "<group>"; };
+		433D9071183EC2A200F90A31 /* libGLEW.1.10.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLEW.1.10.0.dylib; path = ../mac/ExternalPrograms/repository/lib/libGLEW.1.10.0.dylib; sourceTree = "<group>"; };
+		433D9078183EC3D100F90A31 /* liblevmar.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblevmar.dylib; path = ../mac/ExternalPrograms/repository/lib/liblevmar.dylib; sourceTree = "<group>"; };
 		43683877174364B000F72D33 /* BuildConfig.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = BuildConfig.xcconfig; path = "xcode4-scripts/BuildConfig.xcconfig"; sourceTree = "<group>"; };
+		436BB9C51829B33900389F1B /* libboost_system.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_system.dylib; path = ../mac/ExternalPrograms/repository/lib/libboost_system.dylib; sourceTree = "<group>"; };
+		436BB9C61829B33900389F1B /* libboost_thread.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_thread.dylib; path = ../mac/ExternalPrograms/repository/lib/libboost_thread.dylib; sourceTree = "<group>"; };
+		436BB9C71829B33900389F1B /* libpano13.2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpano13.2.0.0.dylib; path = ../mac/ExternalPrograms/repository/lib/libpano13.2.0.0.dylib; sourceTree = "<group>"; };
 		43760E4117064FC400ED2679 /* geocpset */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = geocpset; sourceTree = BUILT_PRODUCTS_DIR; };
 		43760E4F17064FFB00ED2679 /* geocpset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = geocpset.cpp; path = ../src/tools/geocpset.cpp; sourceTree = "<group>"; };
 		43760E551706500C00ED2679 /* pto_var */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_var; sourceTree = BUILT_PRODUCTS_DIR; };
 		43760E5E1706503100ED2679 /* pto_var.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pto_var.cpp; path = ../src/tools/pto_var.cpp; sourceTree = "<group>"; };
 		43760E641706504700ED2679 /* pto_lensstack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_lensstack; sourceTree = BUILT_PRODUCTS_DIR; };
 		43760E6D1706506C00ED2679 /* pto_lensstack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pto_lensstack.cpp; path = ../src/tools/pto_lensstack.cpp; sourceTree = "<group>"; };
-		43760EBA17065E4500ED2679 /* libHalf.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libHalf.7.dylib; path = "../../External/repository-ng/lib/libHalf.7.dylib"; sourceTree = "<group>"; };
-		43760EBB17065E4500ED2679 /* libIlmImf.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libIlmImf.7.dylib; path = "../../External/repository-ng/lib/libIlmImf.7.dylib"; sourceTree = "<group>"; };
 		43760EDE170662ED00ED2679 /* ParseExp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ParseExp.cpp; path = ../src/tools/ParseExp.cpp; sourceTree = "<group>"; };
-		43760EF01707070500ED2679 /* libGLEW.1.9.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libGLEW.1.9.0.dylib; path = "../../External/repository-ng/lib/libGLEW.1.9.0.dylib"; sourceTree = "<group>"; };
-		43760EF31707072C00ED2679 /* libpano13.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpano13.2.dylib; path = "../../External/repository-ng/lib/libpano13.2.dylib"; sourceTree = "<group>"; };
-		43760EF6170707DE00ED2679 /* libexiv2.12.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libexiv2.12.dylib; path = "../../External/repository-ng/lib/libexiv2.12.dylib"; sourceTree = "<group>"; };
-		43760F2A170744C700ED2679 /* libtiff.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libtiff.3.dylib; path = "../../External/repository-ng/lib/libtiff.3.dylib"; sourceTree = "<group>"; };
-		4376108017077F1E00ED2679 /* libboost_regex-1_46.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libboost_regex-1_46.dylib"; path = "../../External/repository-ng/lib/libboost_regex-1_46.dylib"; sourceTree = "<group>"; };
-		4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libboost_system-1_46.dylib"; path = "../../External/repository-ng/lib/libboost_system-1_46.dylib"; sourceTree = "<group>"; };
-		4376108217077F1E00ED2679 /* libboost_thread-1_46.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libboost_thread-1_46.dylib"; path = "../../External/repository-ng/lib/libboost_thread-1_46.dylib"; sourceTree = "<group>"; };
+		43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpano13.3.0.0.dylib; path = ../mac/ExternalPrograms/repository/lib/libpano13.3.0.0.dylib; sourceTree = "<group>"; };
+		43821147187B578000DB9A4D /* libHalf.11.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libHalf.11.dylib; path = ../mac/ExternalPrograms/repository/lib/libHalf.11.dylib; sourceTree = "<group>"; };
+		43821148187B578000DB9A4D /* libIlmImf-Imf_2_1.21.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libIlmImf-Imf_2_1.21.dylib"; path = "../mac/ExternalPrograms/repository/lib/libIlmImf-Imf_2_1.21.dylib"; sourceTree = "<group>"; };
+		43821157187B5B0100DB9A4D /* pto_mask */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_mask; sourceTree = BUILT_PRODUCTS_DIR; };
+		43821160187B5B4200DB9A4D /* pto_mask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pto_mask.cpp; path = ../src/tools/pto_mask.cpp; sourceTree = "<group>"; };
+		43821173187B5B8300DB9A4D /* pto_move */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_move; sourceTree = BUILT_PRODUCTS_DIR; };
+		4382117C187B5BB000DB9A4D /* pto_move.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pto_move.cpp; path = ../src/tools/pto_move.cpp; sourceTree = "<group>"; };
+		43821182187B5BDD00DB9A4D /* pto_template */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_template; sourceTree = BUILT_PRODUCTS_DIR; };
+		4382118B187B5C0F00DB9A4D /* pto_template.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pto_template.cpp; path = ../src/tools/pto_template.cpp; sourceTree = "<group>"; };
+		438211A2187B69EA00DB9A4D /* libboost_filesystem.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_filesystem.dylib; path = ../mac/ExternalPrograms/repository/lib/libboost_filesystem.dylib; sourceTree = "<group>"; };
+		438211A4187BE12F00DB9A4D /* libboost_system.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_system.dylib; path = ../mac/ExternalPrograms/repository/lib/libboost_system.dylib; sourceTree = "<group>"; };
 		43BA355E170506D100D165A4 /* align_image_stack */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = align_image_stack; sourceTree = BUILT_PRODUCTS_DIR; };
 		43BA356A1705073500D165A4 /* Libraries.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = Libraries.xcodeproj; sourceTree = "<group>"; };
 		43BA358F1705075C00D165A4 /* align_image_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = align_image_stack.cpp; path = ../src/tools/align_image_stack.cpp; sourceTree = "<group>"; };
@@ -698,8 +695,6 @@
 		43BA366A170571F000D165A4 /* pto_gen */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pto_gen; sourceTree = BUILT_PRODUCTS_DIR; };
 		43BA3677170571FA00D165A4 /* tca_correct */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tca_correct; sourceTree = BUILT_PRODUCTS_DIR; };
 		43BA36841705720700D165A4 /* deghosting_mask */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = deghosting_mask; sourceTree = BUILT_PRODUCTS_DIR; };
-		43BA36911705720E00D165A4 /* matchpoint */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = matchpoint; sourceTree = BUILT_PRODUCTS_DIR; };
-		43BA369E1705721800D165A4 /* PTBatcher */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = PTBatcher; sourceTree = BUILT_PRODUCTS_DIR; };
 		43BA36AB1705722000D165A4 /* vig_optimize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vig_optimize; sourceTree = BUILT_PRODUCTS_DIR; };
 		43BA36B51705727E00D165A4 /* checkpto.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = checkpto.cpp; path = ../src/tools/checkpto.cpp; sourceTree = "<group>"; };
 		43BA36B61705727E00D165A4 /* cpclean.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cpclean.cpp; path = ../src/tools/cpclean.cpp; sourceTree = "<group>"; };
@@ -736,18 +731,6 @@
 		43BA37001705759D00D165A4 /* khan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = khan.h; path = ../src/deghosting/khan.h; sourceTree = "<group>"; };
 		43BA37011705759D00D165A4 /* support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = support.h; path = ../src/deghosting/support.h; sourceTree = "<group>"; };
 		43BA37021705759D00D165A4 /* threshold.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = threshold.h; path = ../src/deghosting/threshold.h; sourceTree = "<group>"; };
-		43BA3706170575DE00D165A4 /* APImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = APImage.cpp; path = ../src/matchpoint/APImage.cpp; sourceTree = "<group>"; };
-		43BA3707170575DE00D165A4 /* APImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = APImage.h; path = ../src/matchpoint/APImage.h; sourceTree = "<group>"; };
-		43BA3708170575DE00D165A4 /* Descriptor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Descriptor.cpp; path = ../src/matchpoint/Descriptor.cpp; sourceTree = "<group>"; };
-		43BA3709170575DE00D165A4 /* Descriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Descriptor.h; path = ../src/matchpoint/Descriptor.h; sourceTree = "<group>"; };
-		43BA370A170575DE00D165A4 /* edgedetection.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = edgedetection.hxx; path = ../src/matchpoint/edgedetection.hxx; sourceTree = "<group>"; };
-		43BA370B170575DE00D165A4 /* HessianDetector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HessianDetector.cpp; path = ../src/matchpoint/HessianDetector.cpp; sourceTree = "<group>"; };
-		43BA370C170575DE00D165A4 /* HessianDetector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HessianDetector.h; path = ../src/matchpoint/HessianDetector.h; sourceTree = "<group>"; };
-		43BA370E170575DE00D165A4 /* MatchPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MatchPoint.cpp; path = ../src/matchpoint/MatchPoint.cpp; sourceTree = "<group>"; };
-		43BA37151705777C00D165A4 /* Batch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Batch.cpp; path = ../src/hugin1/ptbatcher/Batch.cpp; sourceTree = "<group>"; };
-		43BA37161705777C00D165A4 /* ProjectArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ProjectArray.cpp; path = ../src/hugin1/ptbatcher/ProjectArray.cpp; sourceTree = "<group>"; };
-		43BA37171705777C00D165A4 /* PTBatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PTBatcher.cpp; path = ../src/hugin1/ptbatcher/PTBatcher.cpp; sourceTree = "<group>"; };
-		43BA37181705777C00D165A4 /* RunStitchFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RunStitchFrame.cpp; path = ../src/hugin1/ptbatcher/RunStitchFrame.cpp; sourceTree = "<group>"; };
 		43BA383A17057FD400D165A4 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
 		43BA389D17058CDE00D165A4 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		43BA389F17058CE700D165A4 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = System/Library/Frameworks/GLUT.framework; sourceTree = SDKROOT; };
@@ -759,10 +742,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43760EC317065F0D00ED2679 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43760EC417065F0D00ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43D37129170781AD00B3B844 /* libboost_system-1_46.dylib in Frameworks */,
-				43760F341707475000ED2679 /* libpano13.2.dylib in Frameworks */,
+				43821146187B575400DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				433D9065183EC1F700F90A31 /* libboost_system.dylib in Frameworks */,
+				43760EC317065F0D00ED2679 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43760EC417065F0D00ED2679 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -770,10 +753,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43760ECB17065F3000ED2679 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43760ECC17065F3000ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43D3712B170781BC00B3B844 /* libboost_regex-1_46.dylib in Frameworks */,
-				43D3712A170781B700B3B844 /* libboost_system-1_46.dylib in Frameworks */,
+				433D9076183EC31600F90A31 /* libboost_regex.dylib in Frameworks */,
+				433D9077183EC31600F90A31 /* libboost_system.dylib in Frameworks */,
+				43760ECB17065F3000ED2679 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43760ECC17065F3000ED2679 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -781,10 +764,36 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43760ED117065F4900ED2679 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43760ED217065F4900ED2679 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43D3712C170781C600B3B844 /* libboost_regex-1_46.dylib in Frameworks */,
-				43D3712D170781CA00B3B844 /* libboost_system-1_46.dylib in Frameworks */,
+				43760ED117065F4900ED2679 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43760ED217065F4900ED2679 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
+				433D905F183EC1AB00F90A31 /* libboost_regex.dylib in Frameworks */,
+				433D905D183EC1AA00F90A31 /* libboost_system.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		43821154187B5B0100DB9A4D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4382119C187B5FA800DB9A4D /* libhugin_base-2014.0.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		43821170187B5B8300DB9A4D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				438211A5187BE12F00DB9A4D /* libboost_system.dylib in Frameworks */,
+				438211A3187B69EA00DB9A4D /* libboost_filesystem.dylib in Frameworks */,
+				4382119F187B5FF400DB9A4D /* libhugin_base-2014.0.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4382117F187B5BDD00DB9A4D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				43821199187B5EBF00DB9A4D /* libhugin_base-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -792,10 +801,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA3591170507AF00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA3592170507AF00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				4376108517077F1E00ED2679 /* libboost_system-1_46.dylib in Frameworks */,
-				43760F2E170746E600ED2679 /* libpano13.2.dylib in Frameworks */,
+				43821143187B570D00DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				433D906B183EC24D00F90A31 /* libboost_system.dylib in Frameworks */,
+				43BA3591170507AF00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA3592170507AF00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -803,9 +812,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA35AE1705701B00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA35AF1705701B00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43760F2F170746F700ED2679 /* libpano13.2.dylib in Frameworks */,
+				43821144187B572100DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				43BA35AE1705701B00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA35AF1705701B00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -813,8 +822,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA3727170577C600D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA3728170577C600D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
+				43BA3727170577C600D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA3728170577C600D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -822,8 +831,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA3721170577AC00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA3722170577AC00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
+				43821152187B5AC500DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				43BA3721170577AC00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA3722170577AC00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -831,16 +841,15 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				43821145187B573E00DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				436BB9C81829B33900389F1B /* libboost_system.dylib in Frameworks */,
+				436BB9C91829B33900389F1B /* libboost_thread.dylib in Frameworks */,
 				43BA383B17057FD400D165A4 /* CoreServices.framework in Frameworks */,
-				43BA383817057F1500D165A4 /* libceleste-2013.0.dylib in Frameworks */,
-				43BA382B17057E4D00D165A4 /* libflann-2013.0.dylib in Frameworks */,
-				43BA383217057E9500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA383317057E9500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43BA372B17057A2400D165A4 /* liblocalfeatures-2013.0.dylib in Frameworks */,
+				43BA383817057F1500D165A4 /* libceleste-2014.0.dylib in Frameworks */,
+				43BA383217057E9500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA383317057E9500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
+				43BA372B17057A2400D165A4 /* liblocalfeatures-2014.0.dylib in Frameworks */,
 				43A22C0D170E257300D5A7CC /* libzthread.a in Frameworks */,
-				4376108817077F6500ED2679 /* libboost_thread-1_46.dylib in Frameworks */,
-				4376108917077F6A00ED2679 /* libboost_system-1_46.dylib in Frameworks */,
-				43760F301707470A00ED2679 /* libpano13.2.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -848,13 +857,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA38421705803800D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA38441705803800D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43BA38431705803800D165A4 /* liblensdb-2013.0.dylib in Frameworks */,
-				4376108B17077F7A00ED2679 /* libboost_system-1_46.dylib in Frameworks */,
-				4376108C17077F7E00ED2679 /* libboost_thread-1_46.dylib in Frameworks */,
-				43760EF7170707DE00ED2679 /* libexiv2.12.dylib in Frameworks */,
-				43760F2B170744C700ED2679 /* libtiff.3.dylib in Frameworks */,
+				433D905B183EC16F00F90A31 /* libexiv2.12.dylib in Frameworks */,
+				433D905C183EC16F00F90A31 /* libtiff.5.dylib in Frameworks */,
+				433D9057183EC15400F90A31 /* libboost_system.dylib in Frameworks */,
+				433D9058183EC15400F90A31 /* libboost_thread.dylib in Frameworks */,
+				43BA38421705803800D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA38441705803800D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
+				43BA38431705803800D165A4 /* liblensdb-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -862,11 +871,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA384E1705815300D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA384F1705815300D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				4376108D17077F9900ED2679 /* libboost_system-1_46.dylib in Frameworks */,
-				43760EBC17065E4500ED2679 /* libHalf.7.dylib in Frameworks */,
-				43760EBD17065E4500ED2679 /* libIlmImf.7.dylib in Frameworks */,
+				43821149187B578000DB9A4D /* libHalf.11.dylib in Frameworks */,
+				4382114A187B578000DB9A4D /* libIlmImf-Imf_2_1.21.dylib in Frameworks */,
+				433D9043183DF78700F90A31 /* libboost_system.dylib in Frameworks */,
+				43BA384E1705815300D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA384F1705815300D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -874,11 +883,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43760F1E1707187D00ED2679 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43760F171707157200ED2679 /* libicpfind-2013.0.dylib in Frameworks */,
-				43760F25170718BE00ED2679 /* libpano13.2.dylib in Frameworks */,
-				43352EC2171351D700889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */,
-				43352EC3171351D700889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */,
+				4382114B187B579600DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				433D9063183EC1CF00F90A31 /* libwx_osx_cocoau_gl-3.0.0.0.0.dylib in Frameworks */,
+				433D9064183EC1CF00F90A31 /* libwx_osx_cocoau-3.0.0.0.0.dylib in Frameworks */,
+				43760F1E1707187D00ED2679 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43760F171707157200ED2679 /* libicpfind-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -886,10 +895,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA385B17058A3500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA385C17058A3500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43BA386017058ADC00D165A4 /* liblines-2013.0.dylib in Frameworks */,
-				43760F311707471C00ED2679 /* libpano13.2.dylib in Frameworks */,
+				4382114C187B57A900DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				43BA385B17058A3500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA385C17058A3500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
+				43BA386017058ADC00D165A4 /* liblines-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -897,14 +906,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4382114D187B57BE00DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				433D9073183EC2B700F90A31 /* libtiff.5.dylib in Frameworks */,
+				433D9072183EC2A200F90A31 /* libGLEW.1.10.0.dylib in Frameworks */,
+				433D906F183EC2A200F90A31 /* libboost_system.dylib in Frameworks */,
 				43BA38A017058CE700D165A4 /* GLUT.framework in Frameworks */,
 				43BA389E17058CDE00D165A4 /* OpenGL.framework in Frameworks */,
-				43BA386517058B6D00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA386617058B6D00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				4376108E17077FC000ED2679 /* libboost_system-1_46.dylib in Frameworks */,
-				43760EF11707070500ED2679 /* libGLEW.1.9.0.dylib in Frameworks */,
-				43760EF5170707B500ED2679 /* libpano13.2.dylib in Frameworks */,
-				43760F2C170744DB00ED2679 /* libtiff.3.dylib in Frameworks */,
+				43BA386517058B6D00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA386617058B6D00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -912,8 +921,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA386B17058BA000D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA386C17058BA000D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
+				43BA386B17058BA000D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA386C17058BA000D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -921,9 +930,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA387117058BB500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA387217058BB500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43760F321707473000ED2679 /* libpano13.2.dylib in Frameworks */,
+				4382114E187B57D500DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				43BA387117058BB500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA387217058BB500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -931,11 +940,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA387717058BF500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA387817058BF500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43BA38A617058DB500D165A4 /* libmakefile-2013.0.dylib in Frameworks */,
-				4376108F17077FD700ED2679 /* libboost_system-1_46.dylib in Frameworks */,
-				43760EF41707072C00ED2679 /* libpano13.2.dylib in Frameworks */,
+				4382114F187B57E800DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				433D9069183EC23000F90A31 /* libboost_system.dylib in Frameworks */,
+				43BA387717058BF500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA387817058BF500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
+				43BA38A617058DB500D165A4 /* libmakefile-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -943,8 +952,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA387D17058C0C00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA387E17058C0C00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
+				43BA387D17058C0C00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA387E17058C0C00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -952,9 +961,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA388317058C2500D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA388417058C2500D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43760F331707473F00ED2679 /* libpano13.2.dylib in Frameworks */,
+				43821150187B57FC00DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				43BA388317058C2500D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA388417058C2500D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -962,11 +971,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA388917058C4B00D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA388A17058C4B00D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43BA38AF17058E1A00D165A4 /* liblevmar-2013.0.dylib in Frameworks */,
-				4376109017077FEA00ED2679 /* libboost_system-1_46.dylib in Frameworks */,
-				43760F351707479E00ED2679 /* libpano13.2.dylib in Frameworks */,
+				43821151187B581200DB9A4D /* libpano13.3.0.0.dylib in Frameworks */,
+				433D9079183EC3D100F90A31 /* liblevmar.dylib in Frameworks */,
+				43BA388917058C4B00D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA388A17058C4B00D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
+				433D9055183EC12F00F90A31 /* libboost_system.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -974,30 +983,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA388F17058C6700D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA389017058C6700D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		43BA368E1705720E00D165A4 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				43BA389517058C8600D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA389617058C8600D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		43BA369B1705721800D165A4 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				43760F141707155E00ED2679 /* libbase_wx-2013.0.dylib in Frameworks */,
-				43760F231707189F00ED2679 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43D371281707818400B3B844 /* libboost_system-1_46.dylib in Frameworks */,
-				43760F24170718A900ED2679 /* libpano13.2.dylib in Frameworks */,
-				43352EC4171351ED00889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib in Frameworks */,
-				43352EC5171351F100889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib in Frameworks */,
+				436BB9D1182A16F700389F1B /* libboost_system.dylib in Frameworks */,
+				43BA388F17058C6700D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA389017058C6700D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1005,10 +993,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43BA389B17058CA200D165A4 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43BA389C17058CA200D165A4 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
-				43D371271707817000B3B844 /* libboost_system-1_46.dylib in Frameworks */,
-				43760F2D170744F100ED2679 /* libtiff.3.dylib in Frameworks */,
+				433D9067183EC21400F90A31 /* libboost_system.dylib in Frameworks */,
+				433D9068183EC21400F90A31 /* libtiff.5.dylib in Frameworks */,
+				43BA389B17058CA200D165A4 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43BA389C17058CA200D165A4 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1016,9 +1004,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				43D3725A1709950A00B3B844 /* libceleste-2013.0.dylib in Frameworks */,
-				43D3725B1709950A00B3B844 /* libhugin_base-2013.0.dylib in Frameworks */,
-				43D3725C1709950A00B3B844 /* libhugin_vigra_impex-2013.0.dylib in Frameworks */,
+				43D3725A1709950A00B3B844 /* libceleste-2014.0.dylib in Frameworks */,
+				43D3725B1709950A00B3B844 /* libhugin_base-2014.0.dylib in Frameworks */,
+				43D3725C1709950A00B3B844 /* libhugin_vigra_impex-2014.0.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1040,7 +1028,6 @@
 				43BA358E1705074100D165A4 /* Source Code */,
 				43BA35691705072000D165A4 /* Modules */,
 				43BA3567170506E300D165A4 /* Configuration Files */,
-				43BA38551705820B00D165A4 /* External Libraries */,
 				43BA38561705821600D165A4 /* Frameworks */,
 				43BA348B1704EE8D00D165A4 /* Products */,
 			);
@@ -1066,13 +1053,14 @@
 				43BA366A170571F000D165A4 /* pto_gen */,
 				43BA3677170571FA00D165A4 /* tca_correct */,
 				43BA36841705720700D165A4 /* deghosting_mask */,
-				43BA36911705720E00D165A4 /* matchpoint */,
-				43BA369E1705721800D165A4 /* PTBatcher */,
 				43BA36AB1705722000D165A4 /* vig_optimize */,
 				43760E4117064FC400ED2679 /* geocpset */,
 				43760E551706500C00ED2679 /* pto_var */,
 				43760E641706504700ED2679 /* pto_lensstack */,
 				43D3724A170994BF00B3B844 /* celeste_standalone */,
+				43821157187B5B0100DB9A4D /* pto_mask */,
+				43821173187B5B8300DB9A4D /* pto_move */,
+				43821182187B5BDD00DB9A4D /* pto_template */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1096,19 +1084,17 @@
 		43BA356B1705073500D165A4 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				43BA358D1705073500D165A4 /* libbase_wx-2013.0.dylib */,
-				43BA35871705073500D165A4 /* libceleste-2013.0.dylib */,
-				43BA358B1705073500D165A4 /* libflann-2013.0.dylib */,
-				4335347D171388F900889E02 /* libhpi-2013.0.dylib */,
+				43BA358D1705073500D165A4 /* libbase_wx-2014.0.dylib */,
+				43BA35871705073500D165A4 /* libceleste-2014.0.dylib */,
+				4335347D171388F900889E02 /* libhpi-2014.0.dylib */,
 				43D3717F17079EC400B3B844 /* _hsi.so */,
-				43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */,
-				43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */,
-				43BA36FA1705757D00D165A4 /* libicpfind-2013.0.dylib */,
-				43BA357F1705073500D165A4 /* liblensdb-2013.0.dylib */,
-				43BA357D1705073500D165A4 /* liblevmar-2013.0.dylib */,
-				43BA35851705073500D165A4 /* liblines-2013.0.dylib */,
-				43BA35891705073500D165A4 /* liblocalfeatures-2013.0.dylib */,
-				43BA35831705073500D165A4 /* libmakefile-2013.0.dylib */,
+				43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */,
+				43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */,
+				43BA36FA1705757D00D165A4 /* libicpfind-2014.0.dylib */,
+				43BA357F1705073500D165A4 /* liblensdb-2014.0.dylib */,
+				43BA35851705073500D165A4 /* liblines-2014.0.dylib */,
+				43BA35891705073500D165A4 /* liblocalfeatures-2014.0.dylib */,
+				43BA35831705073500D165A4 /* libmakefile-2014.0.dylib */,
 				43A22C0C170E255A00D5A7CC /* libzthread.a */,
 			);
 			name = Products;
@@ -1129,15 +1115,16 @@
 				43BA36B81705727E00D165A4 /* hugin_hdrmerge.cpp */,
 				43BA36E2170574F100D165A4 /* icpfind.cpp */,
 				43BA36B91705727E00D165A4 /* linefind.cpp */,
-				43BA3705170575B300D165A4 /* matchpoint */,
 				43BA36BA1705727E00D165A4 /* nona.cpp */,
 				43BA36BB1705727E00D165A4 /* pano_modify.cpp */,
 				43BA36BC1705727E00D165A4 /* pano_trafo.cpp */,
-				43BA37141705774800D165A4 /* PTBatcher */,
 				43BA36BF1705727E00D165A4 /* pto2mk.cpp */,
 				43BA36BD1705727E00D165A4 /* pto_gen.cpp */,
 				43760E6D1706506C00ED2679 /* pto_lensstack.cpp */,
+				43821160187B5B4200DB9A4D /* pto_mask.cpp */,
 				43BA36BE1705727E00D165A4 /* pto_merge.cpp */,
+				4382117C187B5BB000DB9A4D /* pto_move.cpp */,
+				4382118B187B5C0F00DB9A4D /* pto_template.cpp */,
 				43760EDD170662D300ED2679 /* pto_var */,
 				43BA36C01705727E00D165A4 /* tca_correct.cpp */,
 				43BA36C11705727E00D165A4 /* vig_optimize.cpp */,
@@ -1188,53 +1175,26 @@
 			name = deghosting_mask;
 			sourceTree = "<group>";
 		};
-		43BA3705170575B300D165A4 /* matchpoint */ = {
-			isa = PBXGroup;
-			children = (
-				43BA3706170575DE00D165A4 /* APImage.cpp */,
-				43BA3707170575DE00D165A4 /* APImage.h */,
-				43BA3708170575DE00D165A4 /* Descriptor.cpp */,
-				43BA3709170575DE00D165A4 /* Descriptor.h */,
-				43BA370A170575DE00D165A4 /* edgedetection.hxx */,
-				43BA370B170575DE00D165A4 /* HessianDetector.cpp */,
-				43BA370C170575DE00D165A4 /* HessianDetector.h */,
-				43BA370E170575DE00D165A4 /* MatchPoint.cpp */,
-			);
-			name = matchpoint;
-			sourceTree = "<group>";
-		};
-		43BA37141705774800D165A4 /* PTBatcher */ = {
-			isa = PBXGroup;
-			children = (
-				43BA37151705777C00D165A4 /* Batch.cpp */,
-				43BA37161705777C00D165A4 /* ProjectArray.cpp */,
-				43BA37171705777C00D165A4 /* PTBatcher.cpp */,
-				43BA37181705777C00D165A4 /* RunStitchFrame.cpp */,
-			);
-			name = PTBatcher;
-			sourceTree = "<group>";
-		};
-		43BA38551705820B00D165A4 /* External Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				4376108017077F1E00ED2679 /* libboost_regex-1_46.dylib */,
-				4376108117077F1E00ED2679 /* libboost_system-1_46.dylib */,
-				4376108217077F1E00ED2679 /* libboost_thread-1_46.dylib */,
-				43760EF6170707DE00ED2679 /* libexiv2.12.dylib */,
-				43760EF01707070500ED2679 /* libGLEW.1.9.0.dylib */,
-				43760EBA17065E4500ED2679 /* libHalf.7.dylib */,
-				43760EBB17065E4500ED2679 /* libIlmImf.7.dylib */,
-				43760EF31707072C00ED2679 /* libpano13.2.dylib */,
-				43760F2A170744C700ED2679 /* libtiff.3.dylib */,
-				43352EC0171351D700889E02 /* libwx_osx_cocoau-2.9.3.0.0.dylib */,
-				43352EC1171351D700889E02 /* libwx_osx_cocoau_gl-2.9.3.0.0.dylib */,
-			);
-			name = "External Libraries";
-			sourceTree = "<group>";
-		};
 		43BA38561705821600D165A4 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				438211A4187BE12F00DB9A4D /* libboost_system.dylib */,
+				438211A2187B69EA00DB9A4D /* libboost_filesystem.dylib */,
+				43821147187B578000DB9A4D /* libHalf.11.dylib */,
+				43821148187B578000DB9A4D /* libIlmImf-Imf_2_1.21.dylib */,
+				43821142187B570D00DB9A4D /* libpano13.3.0.0.dylib */,
+				433D9078183EC3D100F90A31 /* liblevmar.dylib */,
+				433D9071183EC2A200F90A31 /* libGLEW.1.10.0.dylib */,
+				433D9061183EC1CF00F90A31 /* libwx_osx_cocoau_gl-3.0.0.0.0.dylib */,
+				433D9062183EC1CF00F90A31 /* libwx_osx_cocoau-3.0.0.0.0.dylib */,
+				433D905E183EC1AB00F90A31 /* libboost_regex.dylib */,
+				433D9059183EC16F00F90A31 /* libexiv2.12.dylib */,
+				433D905A183EC16F00F90A31 /* libtiff.5.dylib */,
+				433D904A183DF78700F90A31 /* libHalf.10.dylib */,
+				433D904B183DF78700F90A31 /* libIlmImf-Imf_2_0.20.dylib */,
+				436BB9C51829B33900389F1B /* libboost_system.dylib */,
+				436BB9C61829B33900389F1B /* libboost_thread.dylib */,
+				436BB9C71829B33900389F1B /* libpano13.2.0.0.dylib */,
 				43BA389F17058CE700D165A4 /* GLUT.framework */,
 				43BA389D17058CDE00D165A4 /* OpenGL.framework */,
 				43BA383A17057FD400D165A4 /* CoreServices.framework */,
@@ -1299,6 +1259,60 @@
 			productReference = 43760E641706504700ED2679 /* pto_lensstack */;
 			productType = "com.apple.product-type.tool";
 		};
+		43821156187B5B0100DB9A4D /* pto_mask */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4382115D187B5B0100DB9A4D /* Build configuration list for PBXNativeTarget "pto_mask" */;
+			buildPhases = (
+				43821153187B5B0100DB9A4D /* Sources */,
+				43821154187B5B0100DB9A4D /* Frameworks */,
+				43821155187B5B0100DB9A4D /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				4382119E187B5FAE00DB9A4D /* PBXTargetDependency */,
+			);
+			name = pto_mask;
+			productName = pto_mask;
+			productReference = 43821157187B5B0100DB9A4D /* pto_mask */;
+			productType = "com.apple.product-type.tool";
+		};
+		43821172187B5B8300DB9A4D /* pto_move */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 43821179187B5B8300DB9A4D /* Build configuration list for PBXNativeTarget "pto_move" */;
+			buildPhases = (
+				4382116F187B5B8300DB9A4D /* Sources */,
+				43821170187B5B8300DB9A4D /* Frameworks */,
+				43821171187B5B8300DB9A4D /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				438211A1187B5FF900DB9A4D /* PBXTargetDependency */,
+			);
+			name = pto_move;
+			productName = pto_move;
+			productReference = 43821173187B5B8300DB9A4D /* pto_move */;
+			productType = "com.apple.product-type.tool";
+		};
+		43821181187B5BDD00DB9A4D /* pto_template */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 43821188187B5BDD00DB9A4D /* Build configuration list for PBXNativeTarget "pto_template" */;
+			buildPhases = (
+				4382117E187B5BDD00DB9A4D /* Sources */,
+				4382117F187B5BDD00DB9A4D /* Frameworks */,
+				43821180187B5BDD00DB9A4D /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				4382119B187B5F9800DB9A4D /* PBXTargetDependency */,
+			);
+			name = pto_template;
+			productName = pto_template;
+			productReference = 43821182187B5BDD00DB9A4D /* pto_template */;
+			productType = "com.apple.product-type.tool";
+		};
 		43BA355D170506D100D165A4 /* align_image_stack */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 43BA3564170506D100D165A4 /* Build configuration list for PBXNativeTarget "align_image_stack" */;
@@ -1385,7 +1399,6 @@
 				43BA383717057F0F00D165A4 /* PBXTargetDependency */,
 				43BA382F17057E8D00D165A4 /* PBXTargetDependency */,
 				43BA383117057E8D00D165A4 /* PBXTargetDependency */,
-				43BA382A17057E4700D165A4 /* PBXTargetDependency */,
 				43BA372A17057A1E00D165A4 /* PBXTargetDependency */,
 			);
 			name = cpfind;
@@ -1586,7 +1599,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				43BA38AE17058E1400D165A4 /* PBXTargetDependency */,
 				43BA388617058C4400D165A4 /* PBXTargetDependency */,
 				43BA388817058C4400D165A4 /* PBXTargetDependency */,
 			);
@@ -1611,42 +1623,6 @@
 			name = deghosting_mask;
 			productName = deghosting_mask;
 			productReference = 43BA36841705720700D165A4 /* deghosting_mask */;
-			productType = "com.apple.product-type.tool";
-		};
-		43BA36901705720E00D165A4 /* matchpoint */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 43BA36971705720E00D165A4 /* Build configuration list for PBXNativeTarget "matchpoint" */;
-			buildPhases = (
-				43BA368D1705720E00D165A4 /* Sources */,
-				43BA368E1705720E00D165A4 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				43BA389217058C7E00D165A4 /* PBXTargetDependency */,
-				43BA389417058C7E00D165A4 /* PBXTargetDependency */,
-			);
-			name = matchpoint;
-			productName = matchpoint;
-			productReference = 43BA36911705720E00D165A4 /* matchpoint */;
-			productType = "com.apple.product-type.tool";
-		};
-		43BA369D1705721800D165A4 /* PTBatcher */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 43BA36A41705721800D165A4 /* Build configuration list for PBXNativeTarget "PTBatcher" */;
-			buildPhases = (
-				43BA369A1705721800D165A4 /* Sources */,
-				43BA369B1705721800D165A4 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				43760F221707189B00ED2679 /* PBXTargetDependency */,
-				43760F131707155900ED2679 /* PBXTargetDependency */,
-			);
-			name = PTBatcher;
-			productName = PTBatcher;
-			productReference = 43BA369E1705721800D165A4 /* PTBatcher */;
 			productType = "com.apple.product-type.tool";
 		};
 		43BA36AA1705722000D165A4 /* vig_optimize */ = {
@@ -1725,15 +1701,16 @@
 				43BA3601170571A700D165A4 /* hugin_hdrmerge */,
 				43BA360E170571B000D165A4 /* icpfind */,
 				43BA361B170571B800D165A4 /* linefind */,
-				43BA36901705720E00D165A4 /* matchpoint */,
 				43BA3628170571BF00D165A4 /* nona */,
 				43BA3635170571CA00D165A4 /* pano_trafo */,
 				43BA3642170571D400D165A4 /* pano_modify */,
-				43BA369D1705721800D165A4 /* PTBatcher */,
 				43BA364F170571DD00D165A4 /* pto2mk */,
+				43821156187B5B0100DB9A4D /* pto_mask */,
 				43BA365C170571E700D165A4 /* pto_merge */,
+				43821172187B5B8300DB9A4D /* pto_move */,
 				43BA3669170571F000D165A4 /* pto_gen */,
 				43760E631706504700ED2679 /* pto_lensstack */,
+				43821181187B5BDD00DB9A4D /* pto_template */,
 				43760E541706500C00ED2679 /* pto_var */,
 				43BA3676170571FA00D165A4 /* tca_correct */,
 				43BA36AA1705722000D165A4 /* vig_optimize */,
@@ -1742,10 +1719,10 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		4335347D171388F900889E02 /* libhpi-2013.0.dylib */ = {
+		4335347D171388F900889E02 /* libhpi-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "libhpi-2013.0.dylib";
+			path = "libhpi-2014.0.dylib";
 			remoteRef = 4335347C171388F900889E02 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -1756,80 +1733,66 @@
 			remoteRef = 43A22C0B170E255A00D5A7CC /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		43BA357B1705073500D165A4 /* libhugin_vigra_impex-2013.0.dylib */ = {
+		43BA357B1705073500D165A4 /* libhugin_vigra_impex-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "libhugin_vigra_impex-2013.0.dylib";
+			path = "libhugin_vigra_impex-2014.0.dylib";
 			remoteRef = 43BA357A1705073500D165A4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		43BA357D1705073500D165A4 /* liblevmar-2013.0.dylib */ = {
+		43BA357F1705073500D165A4 /* liblensdb-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "liblevmar-2013.0.dylib";
-			remoteRef = 43BA357C1705073500D165A4 /* PBXContainerItemProxy */;
+			path = "liblensdb-2014.0.dylib";
+			remoteRef = 43BA357E1705073500D165A4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		43BA357F1705073500D165A4 /* liblensdb-2013.0.dylib */ = {
+		43BA35811705073500D165A4 /* libhugin_base-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "liblensdb-2013.0.dylib";
-			remoteRef = 43BA357E1705073500D165A4 /* PBXContainerItemProxy */;
+			path = "libhugin_base-2014.0.dylib";
+			remoteRef = 43BA35801705073500D165A4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		43BA35811705073500D165A4 /* libhugin_base-2013.0.dylib */ = {
+		43BA35831705073500D165A4 /* libmakefile-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "libhugin_base-2013.0.dylib";
-			remoteRef = 43BA35801705073500D165A4 /* PBXContainerItemProxy */;
+			path = "libmakefile-2014.0.dylib";
+			remoteRef = 43BA35821705073500D165A4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		43BA35831705073500D165A4 /* libmakefile-2013.0.dylib */ = {
+		43BA35851705073500D165A4 /* liblines-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "libmakefile-2013.0.dylib";
-			remoteRef = 43BA35821705073500D165A4 /* PBXContainerItemProxy */;
+			path = "liblines-2014.0.dylib";
+			remoteRef = 43BA35841705073500D165A4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		43BA35851705073500D165A4 /* liblines-2013.0.dylib */ = {
+		43BA35871705073500D165A4 /* libceleste-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "liblines-2013.0.dylib";
-			remoteRef = 43BA35841705073500D165A4 /* PBXContainerItemProxy */;
+			path = "libceleste-2014.0.dylib";
+			remoteRef = 43BA35861705073500D165A4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		43BA35871705073500D165A4 /* libceleste-2013.0.dylib */ = {
+		43BA35891705073500D165A4 /* liblocalfeatures-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "libceleste-2013.0.dylib";
-			remoteRef = 43BA35861705073500D165A4 /* PBXContainerItemProxy */;
+			path = "liblocalfeatures-2014.0.dylib";
+			remoteRef = 43BA35881705073500D165A4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		43BA35891705073500D165A4 /* liblocalfeatures-2013.0.dylib */ = {
+		43BA358D1705073500D165A4 /* libbase_wx-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "liblocalfeatures-2013.0.dylib";
-			remoteRef = 43BA35881705073500D165A4 /* PBXContainerItemProxy */;
+			path = "libbase_wx-2014.0.dylib";
+			remoteRef = 43BA358C1705073500D165A4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		43BA358B1705073500D165A4 /* libflann-2013.0.dylib */ = {
+		43BA36FA1705757D00D165A4 /* libicpfind-2014.0.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
-			path = "libflann-2013.0.dylib";
-			remoteRef = 43BA358A1705073500D165A4 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		43BA358D1705073500D165A4 /* libbase_wx-2013.0.dylib */ = {
-			isa = PBXReferenceProxy;
-			fileType = "compiled.mach-o.dylib";
-			path = "libbase_wx-2013.0.dylib";
-			remoteRef = 43BA358C1705073500D165A4 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		43BA36FA1705757D00D165A4 /* libicpfind-2013.0.dylib */ = {
-			isa = PBXReferenceProxy;
-			fileType = "compiled.mach-o.dylib";
-			path = "libicpfind-2013.0.dylib";
+			path = "libicpfind-2014.0.dylib";
 			remoteRef = 43BA36F91705757D00D165A4 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
@@ -1868,6 +1831,30 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		43821153187B5B0100DB9A4D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				43821161187B5B4200DB9A4D /* pto_mask.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4382116F187B5B8300DB9A4D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4382117D187B5BB000DB9A4D /* pto_move.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4382117E187B5BDD00DB9A4D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4382118C187B5C0F00DB9A4D /* pto_template.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		43BA355A170506D100D165A4 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2010,28 +1997,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		43BA368D1705720E00D165A4 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				43BA370F170575DE00D165A4 /* APImage.cpp in Sources */,
-				43BA3710170575DE00D165A4 /* Descriptor.cpp in Sources */,
-				43BA3711170575DE00D165A4 /* HessianDetector.cpp in Sources */,
-				43BA3713170575DE00D165A4 /* MatchPoint.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		43BA369A1705721800D165A4 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				43BA37191705777C00D165A4 /* Batch.cpp in Sources */,
-				43BA371A1705777C00D165A4 /* ProjectArray.cpp in Sources */,
-				43BA371B1705777C00D165A4 /* PTBatcher.cpp in Sources */,
-				43BA371C1705777C00D165A4 /* RunStitchFrame.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		43BA36A71705722000D165A4 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -2081,11 +2046,6 @@
 			name = hugin_base;
 			targetProxy = 43760ED617065F5300ED2679 /* PBXContainerItemProxy */;
 		};
-		43760F131707155900ED2679 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = base_wx;
-			targetProxy = 43760F121707155900ED2679 /* PBXContainerItemProxy */;
-		};
 		43760F161707156C00ED2679 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = icpfind;
@@ -2096,10 +2056,20 @@
 			name = hugin_base;
 			targetProxy = 43760F1F1707188400ED2679 /* PBXContainerItemProxy */;
 		};
-		43760F221707189B00ED2679 /* PBXTargetDependency */ = {
+		4382119B187B5F9800DB9A4D /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = hugin_base;
-			targetProxy = 43760F211707189B00ED2679 /* PBXContainerItemProxy */;
+			targetProxy = 4382119A187B5F9800DB9A4D /* PBXContainerItemProxy */;
+		};
+		4382119E187B5FAE00DB9A4D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = hugin_base;
+			targetProxy = 4382119D187B5FAE00DB9A4D /* PBXContainerItemProxy */;
+		};
+		438211A1187B5FF900DB9A4D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = hugin_base;
+			targetProxy = 438211A0187B5FF900DB9A4D /* PBXContainerItemProxy */;
 		};
 		43A22C09170E255A00D5A7CC /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
@@ -2151,11 +2121,6 @@
 			name = localfeatures;
 			targetProxy = 43BA372917057A1E00D165A4 /* PBXContainerItemProxy */;
 		};
-		43BA382A17057E4700D165A4 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = flann;
-			targetProxy = 43BA382917057E4700D165A4 /* PBXContainerItemProxy */;
-		};
 		43BA382F17057E8D00D165A4 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = vigra_impex;
@@ -2291,16 +2256,6 @@
 			name = hugin_base;
 			targetProxy = 43BA388D17058C6000D165A4 /* PBXContainerItemProxy */;
 		};
-		43BA389217058C7E00D165A4 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = vigra_impex;
-			targetProxy = 43BA389117058C7E00D165A4 /* PBXContainerItemProxy */;
-		};
-		43BA389417058C7E00D165A4 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = hugin_base;
-			targetProxy = 43BA389317058C7E00D165A4 /* PBXContainerItemProxy */;
-		};
 		43BA389817058C9A00D165A4 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = vigra_impex;
@@ -2315,11 +2270,6 @@
 			isa = PBXTargetDependency;
 			name = makefile;
 			targetProxy = 43BA38A717058DBB00D165A4 /* PBXContainerItemProxy */;
-		};
-		43BA38AE17058E1400D165A4 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = levmar;
-			targetProxy = 43BA38AD17058E1400D165A4 /* PBXContainerItemProxy */;
 		};
 		43D37255170994FB00B3B844 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
@@ -2350,6 +2300,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2364,6 +2319,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2380,6 +2340,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2395,6 +2359,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2410,6 +2378,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2424,14 +2396,198 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
 		};
+		4382115E187B5B0100DB9A4D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		4382115F187B5B0100DB9A4D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		4382117A187B5B8300DB9A4D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		4382117B187B5B8300DB9A4D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		43821189187B5BDD00DB9A4D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		4382118A187B5BDD00DB9A4D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 		43BA31B01702E69C00D165A4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 43683877174364B000F72D33 /* BuildConfig.xcconfig */;
 			buildSettings = {
+				GCC_VERSION = "";
 			};
 			name = Debug;
 		};
@@ -2439,6 +2595,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 43683877174364B000F72D33 /* BuildConfig.xcconfig */;
 			buildSettings = {
+				GCC_VERSION = "";
 			};
 			name = Release;
 		};
@@ -2453,6 +2610,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2467,6 +2629,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2482,6 +2649,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2496,6 +2668,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2540,6 +2717,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2554,6 +2735,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2581,6 +2766,11 @@
 					"${SRCROOT}/../src/celeste",
 					"${SRCROOT}/../src/foreign/zthread/include",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2609,6 +2799,11 @@
 					"${SRCROOT}/../src/celeste",
 					"${SRCROOT}/../src/foreign/zthread/include",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2624,6 +2819,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2638,6 +2837,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2653,6 +2856,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2667,6 +2875,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2682,6 +2895,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				OTHER_CFLAGS = "${WX_CFLAGS}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2696,6 +2914,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				OTHER_CFLAGS = "${WX_CFLAGS}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -2712,6 +2935,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2726,6 +2954,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2741,6 +2974,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2755,6 +2993,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2799,6 +3042,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2813,6 +3061,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2828,6 +3081,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2842,6 +3100,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2886,6 +3149,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2900,6 +3168,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2915,6 +3188,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2929,6 +3207,11 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -2944,6 +3227,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2958,11 +3245,15 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
 		};
-		43BA36981705720E00D165A4 /* Debug */ = {
+		43BA36B21705722000D165A4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -2973,11 +3264,15 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
 		};
-		43BA36991705720E00D165A4 /* Release */ = {
+		43BA36B31705722000D165A4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2987,66 +3282,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		43BA36A51705721800D165A4 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				OTHER_CFLAGS = "${WX_CFLAGS}";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		43BA36A61705721800D165A4 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				OTHER_CFLAGS = "${WX_CFLAGS}";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Release;
-		};
-		43BA36B21705722000D165A4 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = Debug;
-		};
-		43BA36B31705722000D165A4 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(REPOSITORY_DIR)/lib",
+				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -3110,6 +3349,33 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		4382115D187B5B0100DB9A4D /* Build configuration list for PBXNativeTarget "pto_mask" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4382115E187B5B0100DB9A4D /* Debug */,
+				4382115F187B5B0100DB9A4D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		43821179187B5B8300DB9A4D /* Build configuration list for PBXNativeTarget "pto_move" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4382117A187B5B8300DB9A4D /* Debug */,
+				4382117B187B5B8300DB9A4D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		43821188187B5BDD00DB9A4D /* Build configuration list for PBXNativeTarget "pto_template" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				43821189187B5BDD00DB9A4D /* Debug */,
+				4382118A187B5BDD00DB9A4D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		43BA31AF1702E69C00D165A4 /* Build configuration list for PBXProject "Tools" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -3272,24 +3538,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		43BA36971705720E00D165A4 /* Build configuration list for PBXNativeTarget "matchpoint" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				43BA36981705720E00D165A4 /* Debug */,
-				43BA36991705720E00D165A4 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		43BA36A41705721800D165A4 /* Build configuration list for PBXNativeTarget "PTBatcher" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				43BA36A51705721800D165A4 /* Debug */,
-				43BA36A61705721800D165A4 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		43BA36B11705722000D165A4 /* Build configuration list for PBXNativeTarget "vig_optimize" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (