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, 13 deletions

diff --git a/server/core/Plugin.php b/server/core/Plugin.php
deleted file mode 100644
index e6fd8a7..0000000
--- a/server/core/Plugin.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-abstract class plugin{
-
-	public $api;
-
-	public function __construct($api){
-
-		$this->api = $api;
-
-	}
-
-}