Fix merge conflict

scripts/main.ape.js

@@ -1,19 +1,30 @@
-Ape.addEvent("init", function() {
-	include("framework/mootools.js");
-	include("framework/Http.js");
-	include("framework/userslist.js");
-	include("framework/log.js"); //Enhanced Ape.log() method, comment this line to disable it.
-	include("utils/utils.js");
-	include("commands/proxy.js");
-	include("commands/inlinepush.js");
-	include("examples/nickname.js");
-	include("examples/move.js");
-	include("utils/checkTool.js"); //Just needed for the APE JSF diagnostic tool, once APE is installed you can remove it 
-	//include("examples/ircserver.js");
-	//include("framework/http_auth.js");
-
-	//Those file are used to test feature of APE.
-	//include("test/MySQL.js");
-	//include("test/Socket.js");
-	//include("test/Pipes.js");
+Ape.addEvent('init', function() {
+	try {
+		//This file is essential
+		include('framework/mootools.js');
+
+		//These 4 files are recommended
+		include('utils/utils.js');
+		include('framework/Http.js');
+		include('framework/userslist.js');
+		include('commands/proxy.js');
+		include("framework/log.js"); //Enhanced Ape.log() method, comment this line to disable it.
+
+		//These 5 files are meant for the demo's
+		//include('framework/http_auth.js');
+		//include('commands/inlinepush.js');
+		//include('examples/nickname.js');
+		//include('examples/move.js');
+		//include('examples/ircserver.js');
+
+
+		//This file is needed for the APE JSF diagnostic tool, once APE is installed you can remove it
+		///include('utils/checkTool.js');
+
+		//This file is used to test features of APE. Especially meant for develompment of APE Features
+		//include('test/_tests.js');
+
+	} catch (e) {
+		Ape.log(e.message + '\n\t' + e.fileName + ':' + e.lineNumber);
+	}
 });