Merge branch 'refs/heads/dev' into plugin

# Conflicts:
#	.gitmodules
#	CMakeLists.txt
#	ext/core

app/main.cpp

@@ -143,6 +143,7 @@ int decompress_project(const QString &project)
 
 int main(int argc, char *argv[])
 {
+
 	// Set up debug handler
 	qInstallMessageHandler(olive::DebugHandler);