Merge branch 'master' into project_setup_refactor

# Conflicts:
#	3rdParty/CMakeLists.txt
#	3rdParty/libarchive/CMakeLists.txt
#	CMakeLists.txt

openVulkanoCpp/Host/iOS/OpenVulkanoOrientationLockableViewController.mm

@@ -11,7 +11,7 @@
 
 @implementation OpenVulkanoOrientationLockableViewController
 -(id)init {
-	[super init];
+	self = [super init];
 	_rotationLockedView = nil;
 	return self;
 }