Merge branch 'migrate' of https://github.com/felixjogris/PrivateBin into felixjogris-migrate

tst/JsonApiTest.php

@@ -18,7 +18,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
         if (!is_dir($this->_path)) {
             mkdir($this->_path);
         }
-        $this->_model = Filesystem::getInstance(array('dir' => $this->_path));
+        $this->_model = new Filesystem(array('dir' => $this->_path));
         ServerSalt::setStore($this->_model);
 
         $_POST   = array();