Merge branch 'develop' into Eole_Graph

Conflicts:
	client/index.html
	client/js/controllers/home/home.js
	client/partials/home/home.html

1 files changed, 0 insertions, 24 deletions

diff --git a/server/core/Plugin_Api.php b/server/core/Plugin_Api.php
deleted file mode 100644
index 20ffd0c..0000000
--- a/server/core/Plugin_Api.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-//Init plugin directory
-/*if (!defined('PLUGINS_DIR')) {
-    define('PLUGINS_DIR', INSTALL_PATH . 'plugins/');
-}*/
-
-class plugin_api{
-
-	static protected $instance;
-
-	protected function __construct(){
-
-	}
-
-	static function getInstance(){
-		
-		if(!self::$instance){
-			self::$instance = new plugin_api();
-		}
-
-		return self::$instance;
-	}
-}