Merge branch 'dev' of https://github.com/metalgvc/monstra-cms into metalgvc-dev

Conflicts:
	plugins/box/filesmanager/views/backend/index.view.php

plugins/box/filesmanager/filesmanager.admin.php

@@ -1,5 +1,9 @@
 <?php
 
+// Add Plugin Javascript
+Stylesheet::add('plugins/box/filesmanager/css/style.css', 'backend');
+Javascript::add('plugins/box/filesmanager/js/fileuploader.js', 'backend');
+
 // Add plugin navigation link
 Navigation::add(__('Files', 'filesmanager'), 'content', 'filesmanager', 3);
 
@@ -166,7 +170,10 @@ class FilesmanagerAdmin extends Backend
                 ->assign('image_types', $image_types)
                 ->assign('site_url', $site_url)
                 ->assign('files_path', $files_path)
-                ->display();
+                ->assign('fileuploader', array(
+                    'uploadUrl' => $site_url.'/admin/index.php?id=filesmanager&path='.$path,
+                    'csrf'      => Security::token()
+                ))->display();
 
     }