diff --git a/ajax/locations.php b/ajax/locations.php
new file mode 100644
index 00000000..04d65b8a
--- /dev/null
+++ b/ajax/locations.php
@@ -0,0 +1,67 @@
+<?php
+  \OCP\User::checkLoggedIn();
+
+  if (!\OCP\App::isEnabled('flowupload')) {
+  	http_response_code(403);
+  }
+
+  function getAllLocations() {
+    // ToDo: Return locations from database
+    return array(
+      array(
+        'id' => 0,
+        'location' => '/flowupload/',
+        'pause' => 0,
+        'uploading' => 0,
+        'completed' => 0,
+        'aborted' => 0
+      )
+    );
+  }
+
+  function addNewLocation($location) {
+    // ToDo: Add to database
+  	$location = preg_replace('/(\.\.\/|~|\/\/)/i', '', '/'.$location.'/');
+    $location = preg_replace('/[^a-z0-9äöüß \(\)\.\-_\/]/i', '', $location);
+  	$location = trim($location);
+
+    return $location;
+  }
+
+  if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $_POST = json_decode(file_get_contents('php://input'), true);
+
+    if (isset($_POST['location']) && \OC\Files\Filesystem::isValidPath($_POST['location'])) {
+      $locations = getAllLocations();
+
+      foreach ($locations as $location) {
+        if ($location['location'] === $_POST['location']) {
+          http_response_code(409);
+          die();
+        }
+      }
+
+      http_response_code(201);
+
+      $location = addNewLocation($_POST['location']);
+
+      echo json_encode(array(
+          'id' => preg_replace('#/#', '', $location),
+          'location' => $location,
+          'pause' => 0,
+          'uploading' => 0,
+          'completed' => 0,
+          'aborted' => 0
+        ));
+    }
+    else {
+      http_response_code(400);
+    }
+
+    die();
+  }
+
+  echo json_encode(array(
+    "locations" => getAllLocations()
+  ));
+?>
diff --git a/ajax/upload.php b/ajax/upload.php
index 2ea13062..5e2db31d 100644
--- a/ajax/upload.php
+++ b/ajax/upload.php
@@ -11,7 +11,8 @@
 // Directory definitions
 $userhome = OC_User::getHome(OC_User::getUser());
 $temp = $userhome.'/.flowupload_tmp/';
-$result = '/flowupload/';
+$result = $_REQUEST['target'] ?? '/flowupload/';
+$result = '/'.$result.'/';
 
 // Initialize uploader
 $config = new \Flow\Config();
diff --git a/appinfo/info.xml b/appinfo/info.xml
index fcf46b7e..c554ea11 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -3,10 +3,11 @@
     <id>flowupload</id>
     <name>Flow Upload</name>
     <description>Provides functions to upload large files with your HTML5-Browser.</description>
-    <version>0.0.9</version>
-    <licence>agpl</licence>
+    <version>0.2.0</version>
+    <licence>AGPL</licence>
     <author>Patrick Schwarz</author>
     <author>e-alfred</author>
+    <author>NastuzziSamy</author>
     <category>tools</category>
     <website>https://github.com/e-alfred/flowupload</website>
     <repository>https://github.com/e-alfred/flowupload</repository>
diff --git a/appinfo/routes.php b/appinfo/routes.php
index df1b7bed..c4682e19 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -4,4 +4,7 @@
 	->actionInclude('flowupload/index.php');
 
 $this->create('flowupload_ajax_upload', 'ajax/upload.php')
-	->actionInclude('flowupload/ajax/upload.php');
\ No newline at end of file
+	->actionInclude('flowupload/ajax/upload.php');
+
+$this->create('flowupload_ajax_locations', 'ajax/locations.php')
+	->actionInclude('flowupload/ajax/locations.php');
diff --git a/index.php b/index.php
index 4e2f88b5..85685c32 100644
--- a/index.php
+++ b/index.php
@@ -5,7 +5,19 @@
 \OCP\Util::addScript('flowupload', 'angular');
 \OCP\Util::addScript('flowupload', 'ng-flow-standalone');
 \OCP\Util::addScript('flowupload', 'app');
+\OCP\Util::addScript('flowupload', 'script');
 \OCP\Util::addStyle('flowupload', 'bootstrap-combined');
 
+$locations = array(
+  array(
+    'id' => 0,
+    'location' => '/flowupload/',
+    'nbrInPause' => 0,
+    'nbrUploading' => 0,
+    'nbrCompleted' => 0,
+    'nbrAborted' => 0,
+  )
+);
+
 $tpl = new OCP\Template("flowupload", "main", "user");
 $tpl->printPage();
diff --git a/js/app.js b/js/app.js
index 0c85b638..7966b37a 100644
--- a/js/app.js
+++ b/js/app.js
@@ -2,30 +2,135 @@
 'use strict';
 
 /**
- * The main app module
- * @name app
- * @type {angular.Module}
- */
-var app = angular.module('app', ['flow'])
-.config(['flowFactoryProvider', function (flowFactoryProvider) {
-  flowFactoryProvider.defaults = {
-    target: 'ajax/upload.php',
-    permanentErrors: [403, 404, 500, 501],
-    maxChunkRetries: 2,
-    chunkRetryInterval: 5000,
-    simultaneousUploads: 4
-  };
-  flowFactoryProvider.on('catchAll', function (event) {
-    console.log('catchAll', arguments);
-  });
+* The main app module
+* @name app
+* @type {angular.Module}
+*/
+var app = angular.module('app', ['flow']).config(['flowFactoryProvider', function (flowFactoryProvider) {
+	flowFactoryProvider.defaults = {
+		target: 'ajax/upload.php',
+		permanentErrors: [403, 404, 500, 501],
+		maxChunkRetries: 2,
+		chunkRetryInterval: 5000,
+		simultaneousUploads: 4
+	};
+	flowFactoryProvider.on('catchAll', function ($event, file) {
+		if ($event === 'fileAdded')
+			console.log(file);
+	});
 }]);
 
-app.filter('bytes', function() {
+app.filter('bytes', function () {
 	return function(bytes, precision) {
 		if (isNaN(parseFloat(bytes)) || bytes == 0 || !isFinite(bytes)) return '-';
 		if (typeof precision === 'undefined') precision = 1;
+
 		var units = ['bytes', 'kB', 'MB', 'GB'],
-			number = Math.floor(Math.log(bytes) / Math.log(1024));
+		number = Math.floor(Math.log(bytes) / Math.log(1024));
+
 		return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) +  ' ' + units[number];
 	}
-});
\ No newline at end of file
+});
+
+app.controller('location', function ($scope) {
+	$scope.init = function (id, name) {
+		$scope.locationId = id;
+		$scope.locationName = name;
+	}
+
+	$scope.seeUploads = function ($event, type) {
+		$event.stopPropagation();
+		$event.preventDefault();
+
+		console.log($scope);
+
+		$('#locations li.active').removeClass('active');
+
+		$($event.currentTarget).addClass('active');
+	};
+
+	$scope.beforeUploading = {
+		query: function (flowFile, flowChunk) {
+			// function will be called for every request
+			console.log('File', flowFile);
+			console.log('Chunk', flowChunk);
+			return {
+				//id: $scope.locationId
+				// Temporary:
+				target: $scope.locationName
+			};
+		}
+	};
+});
+
+app.controller('flow', function ($scope) {
+	$scope.locationId = 0;
+
+	$scope.$on('changeLocation', function (event, id, $flow) {
+		$scope.locationId = id;
+		$scope.$flow = $flow;
+
+		console.log(id);
+		console.log($flow);
+	});
+});
+
+app.controller('locations', function ($rootScope, $scope, $http) {
+	$scope.isOpen = false;
+
+	$scope.reloadLocations = function () {
+		setTimeout(function () {
+			if ($scope.locationId === undefined)
+				$($($('.locations')[0]).find('a')).click();
+			else
+				$($('#location-' + $scope.locationId).find('a')).click();
+		}, 100);
+	}
+
+	$scope.setLocation = function (id, $flow) {
+		$rootScope.$broadcast('changeLocation', id, $flow);
+		$scope.$flow = $flow;
+		$scope.locationId = id;
+
+		$('.locations').each(function () {
+			if ($(this).attr('id') === 'location-' + id)
+				$(this).addClass('open');
+			else
+				$(this).removeClass('open');
+			}
+		);
+	}
+
+	$scope.getLocations = function () {
+		$http({
+			method: "GET",
+			url: "ajax/locations.php"
+		}).then(function mySuccess(response) {
+				$scope.locations = response.data.locations;
+
+				$scope.locationId = $scope.locations[0].id;
+			}, function myError(response) {
+				$scope.locations = {};
+			}
+		);
+	};
+
+	$scope.addNewLocation = function () {
+		$http({
+			method : "POST",
+			url : "ajax/locations.php",
+			data : {
+				location: $('#newLocationName').val()
+			}
+		}).then(function mySuccess(response) {
+			$('#newLocationName').val('');
+
+			$scope.locationId = response.data.id;
+			$scope.locations.push(response.data);
+		}, function myError(response) {
+			$scope.locations = {};
+		});
+	};
+
+	$scope.getLocations();
+});
diff --git a/js/ng-flow-standalone.js b/js/ng-flow-standalone.js
index c80610c3..99179080 100644
--- a/js/ng-flow-standalone.js
+++ b/js/ng-flow-standalone.js
@@ -1,1925 +1,2 @@
-/**
- * @license MIT
- */
-(function(window, document, undefined) {'use strict';
-  // ie10+
-  var ie10plus = window.navigator.msPointerEnabled;
-  /**
-   * Flow.js is a library providing multiple simultaneous, stable and
-   * resumable uploads via the HTML5 File API.
-   * @param [opts]
-   * @param {number} [opts.chunkSize]
-   * @param {bool} [opts.forceChunkSize]
-   * @param {number} [opts.simultaneousUploads]
-   * @param {bool} [opts.singleFile]
-   * @param {string} [opts.fileParameterName]
-   * @param {number} [opts.progressCallbacksInterval]
-   * @param {number} [opts.speedSmoothingFactor]
-   * @param {Object|Function} [opts.query]
-   * @param {Object|Function} [opts.headers]
-   * @param {bool} [opts.withCredentials]
-   * @param {Function} [opts.preprocess]
-   * @param {string} [opts.method]
-   * @param {string|Function} [opts.testMethod]
-   * @param {string|Function} [opts.uploadMethod]
-   * @param {bool} [opts.prioritizeFirstAndLastChunk]
-   * @param {bool} [opts.allowDuplicateUploads]
-   * @param {string|Function} [opts.target]
-   * @param {number} [opts.maxChunkRetries]
-   * @param {number} [opts.chunkRetryInterval]
-   * @param {Array.<number>} [opts.permanentErrors]
-   * @param {Array.<number>} [opts.successStatuses]
-   * @param {Function} [opts.initFileFn]
-   * @param {Function} [opts.readFileFn]
-   * @param {Function} [opts.generateUniqueIdentifier]
-   * @constructor
-   */
-  function Flow(opts) {
-    /**
-     * Supported by browser?
-     * @type {boolean}
-     */
-    this.support = (
-        typeof File !== 'undefined' &&
-        typeof Blob !== 'undefined' &&
-        typeof FileList !== 'undefined' &&
-        (
-          !!Blob.prototype.slice || !!Blob.prototype.webkitSlice || !!Blob.prototype.mozSlice ||
-          false
-        ) // slicing files support
-    );
-
-    if (!this.support) {
-      return ;
-    }
-
-    /**
-     * Check if directory upload is supported
-     * @type {boolean}
-     */
-    this.supportDirectory = (
-        /Chrome/.test(window.navigator.userAgent) ||
-        /Firefox/.test(window.navigator.userAgent) ||
-        /Edge/.test(window.navigator.userAgent)
-    );
-
-    /**
-     * List of FlowFile objects
-     * @type {Array.<FlowFile>}
-     */
-    this.files = [];
-
-    /**
-     * Default options for flow.js
-     * @type {Object}
-     */
-    this.defaults = {
-      chunkSize: 1024 * 1024,
-      forceChunkSize: false,
-      simultaneousUploads: 3,
-      singleFile: false,
-      fileParameterName: 'file',
-      progressCallbacksInterval: 500,
-      speedSmoothingFactor: 0.1,
-      query: {},
-      headers: {},
-      withCredentials: false,
-      preprocess: null,
-      method: 'multipart',
-      testMethod: 'GET',
-      uploadMethod: 'POST',
-      prioritizeFirstAndLastChunk: false,
-      allowDuplicateUploads: false,
-      target: '/',
-      testChunks: true,
-      generateUniqueIdentifier: null,
-      maxChunkRetries: 0,
-      chunkRetryInterval: null,
-      permanentErrors: [404, 413, 415, 500, 501],
-      successStatuses: [200, 201, 202],
-      onDropStopPropagation: false,
-      initFileFn: null,
-      readFileFn: webAPIFileRead
-    };
-
-    /**
-     * Current options
-     * @type {Object}
-     */
-    this.opts = {};
-
-    /**
-     * List of events:
-     *  key stands for event name
-     *  value array list of callbacks
-     * @type {}
-     */
-    this.events = {};
-
-    var $ = this;
-
-    /**
-     * On drop event
-     * @function
-     * @param {MouseEvent} event
-     */
-    this.onDrop = function (event) {
-      if ($.opts.onDropStopPropagation) {
-        event.stopPropagation();
-      }
-      event.preventDefault();
-      var dataTransfer = event.dataTransfer;
-      if (dataTransfer.items && dataTransfer.items[0] &&
-        dataTransfer.items[0].webkitGetAsEntry) {
-        $.webkitReadDataTransfer(event);
-      } else {
-        $.addFiles(dataTransfer.files, event);
-      }
-    };
-
-    /**
-     * Prevent default
-     * @function
-     * @param {MouseEvent} event
-     */
-    this.preventEvent = function (event) {
-      event.preventDefault();
-    };
-
-
-    /**
-     * Current options
-     * @type {Object}
-     */
-    this.opts = Flow.extend({}, this.defaults, opts || {});
-
-  }
-
-  Flow.prototype = {
-    /**
-     * Set a callback for an event, possible events:
-     * fileSuccess(file), fileProgress(file), fileAdded(file, event),
-     * fileRemoved(file), fileRetry(file), fileError(file, message),
-     * complete(), progress(), error(message, file), pause()
-     * @function
-     * @param {string} event
-     * @param {Function} callback
-     */
-    on: function (event, callback) {
-      event = event.toLowerCase();
-      if (!this.events.hasOwnProperty(event)) {
-        this.events[event] = [];
-      }
-      this.events[event].push(callback);
-    },
-
-    /**
-     * Remove event callback
-     * @function
-     * @param {string} [event] removes all events if not specified
-     * @param {Function} [fn] removes all callbacks of event if not specified
-     */
-    off: function (event, fn) {
-      if (event !== undefined) {
-        event = event.toLowerCase();
-        if (fn !== undefined) {
-          if (this.events.hasOwnProperty(event)) {
-            arrayRemove(this.events[event], fn);
-          }
-        } else {
-          delete this.events[event];
-        }
-      } else {
-        this.events = {};
-      }
-    },
-
-    /**
-     * Fire an event
-     * @function
-     * @param {string} event event name
-     * @param {...} args arguments of a callback
-     * @return {bool} value is false if at least one of the event handlers which handled this event
-     * returned false. Otherwise it returns true.
-     */
-    fire: function (event, args) {
-      // `arguments` is an object, not array, in FF, so:
-      args = Array.prototype.slice.call(arguments);
-      event = event.toLowerCase();
-      var preventDefault = false;
-      if (this.events.hasOwnProperty(event)) {
-        each(this.events[event], function (callback) {
-          preventDefault = callback.apply(this, args.slice(1)) === false || preventDefault;
-        }, this);
-      }
-      if (event != 'catchall') {
-        args.unshift('catchAll');
-        preventDefault = this.fire.apply(this, args) === false || preventDefault;
-      }
-      return !preventDefault;
-    },
-
-    /**
-     * Read webkit dataTransfer object
-     * @param event
-     */
-    webkitReadDataTransfer: function (event) {
-      var $ = this;
-      var queue = event.dataTransfer.items.length;
-      var files = [];
-      each(event.dataTransfer.items, function (item) {
-        var entry = item.webkitGetAsEntry();
-        if (!entry) {
-          decrement();
-          return ;
-        }
-        if (entry.isFile) {
-          // due to a bug in Chrome's File System API impl - #149735
-          fileReadSuccess(item.getAsFile(), entry.fullPath);
-        } else {
-          readDirectory(entry.createReader());
-        }
-      });
-      function readDirectory(reader) {
-        reader.readEntries(function (entries) {
-          if (entries.length) {
-            queue += entries.length;
-            each(entries, function(entry) {
-              if (entry.isFile) {
-                var fullPath = entry.fullPath;
-                entry.file(function (file) {
-                  fileReadSuccess(file, fullPath);
-                }, readError);
-              } else if (entry.isDirectory) {
-                readDirectory(entry.createReader());
-              }
-            });
-            readDirectory(reader);
-          } else {
-            decrement();
-          }
-        }, readError);
-      }
-      function fileReadSuccess(file, fullPath) {
-        // relative path should not start with "/"
-        file.relativePath = fullPath.substring(1);
-        files.push(file);
-        decrement();
-      }
-      function readError(fileError) {
-        throw fileError;
-      }
-      function decrement() {
-        if (--queue == 0) {
-          $.addFiles(files, event);
-        }
-      }
-    },
-
-    /**
-     * Generate unique identifier for a file
-     * @function
-     * @param {FlowFile} file
-     * @returns {string}
-     */
-    generateUniqueIdentifier: function (file) {
-      var custom = this.opts.generateUniqueIdentifier;
-      if (typeof custom === 'function') {
-        return custom(file);
-      }
-      // Some confusion in different versions of Firefox
-      var relativePath = file.relativePath || file.webkitRelativePath || file.fileName || file.name;
-      return file.size + '-' + relativePath.replace(/[^0-9a-zA-Z_-]/img, '');
-    },
-
-    /**
-     * Upload next chunk from the queue
-     * @function
-     * @returns {boolean}
-     * @private
-     */
-    uploadNextChunk: function (preventEvents) {
-      // In some cases (such as videos) it's really handy to upload the first
-      // and last chunk of a file quickly; this let's the server check the file's
-      // metadata and determine if there's even a point in continuing.
-      var found = false;
-      if (this.opts.prioritizeFirstAndLastChunk) {
-        each(this.files, function (file) {
-          if (!file.paused && file.chunks.length &&
-            file.chunks[0].status() === 'pending') {
-            file.chunks[0].send();
-            found = true;
-            return false;
-          }
-          if (!file.paused && file.chunks.length > 1 &&
-            file.chunks[file.chunks.length - 1].status() === 'pending') {
-            file.chunks[file.chunks.length - 1].send();
-            found = true;
-            return false;
-          }
-        });
-        if (found) {
-          return found;
-        }
-      }
-
-      // Now, simply look for the next, best thing to upload
-      each(this.files, function (file) {
-        if (!file.paused) {
-          each(file.chunks, function (chunk) {
-            if (chunk.status() === 'pending') {
-              chunk.send();
-              found = true;
-              return false;
-            }
-          });
-        }
-        if (found) {
-          return false;
-        }
-      });
-      if (found) {
-        return true;
-      }
-
-      // The are no more outstanding chunks to upload, check is everything is done
-      var outstanding = false;
-      each(this.files, function (file) {
-        if (!file.isComplete()) {
-          outstanding = true;
-          return false;
-        }
-      });
-      if (!outstanding && !preventEvents) {
-        // All chunks have been uploaded, complete
-        async(function () {
-          this.fire('complete');
-        }, this);
-      }
-      return false;
-    },
-
-
-    /**
-     * Assign a browse action to one or more DOM nodes.
-     * @function
-     * @param {Element|Array.<Element>} domNodes
-     * @param {boolean} isDirectory Pass in true to allow directories to
-     * @param {boolean} singleFile prevent multi file upload
-     * @param {Object} attributes set custom attributes:
-     *  http://www.w3.org/TR/html-markup/input.file.html#input.file-attributes
-     *  eg: accept: 'image/*'
-     * be selected (Chrome only).
-     */
-    assignBrowse: function (domNodes, isDirectory, singleFile, attributes) {
-      if (domNodes instanceof Element) {
-        domNodes = [domNodes];
-      }
-
-      each(domNodes, function (domNode) {
-        var input;
-        if (domNode.tagName === 'INPUT' && domNode.type === 'file') {
-          input = domNode;
-        } else {
-          input = document.createElement('input');
-          input.setAttribute('type', 'file');
-          // display:none - not working in opera 12
-          extend(input.style, {
-            visibility: 'hidden',
-            position: 'absolute',
-            width: '1px',
-            height: '1px'
-          });
-          // for opera 12 browser, input must be assigned to a document
-          domNode.appendChild(input);
-          // https://developer.mozilla.org/en/using_files_from_web_applications)
-          // event listener is executed two times
-          // first one - original mouse click event
-          // second - input.click(), input is inside domNode
-          domNode.addEventListener('click', function() {
-            input.click();
-          }, false);
-        }
-        if (!this.opts.singleFile && !singleFile) {
-          input.setAttribute('multiple', 'multiple');
-        }
-        if (isDirectory) {
-          input.setAttribute('webkitdirectory', 'webkitdirectory');
-        }
-        each(attributes, function (value, key) {
-          input.setAttribute(key, value);
-        });
-        // When new files are added, simply append them to the overall list
-        var $ = this;
-        input.addEventListener('change', function (e) {
-       	  if (e.target.value) {
-            $.addFiles(e.target.files, e);
-            e.target.value = '';
-       	  }
-        }, false);
-      }, this);
-    },
-
-    /**
-     * Assign one or more DOM nodes as a drop target.
-     * @function
-     * @param {Element|Array.<Element>} domNodes
-     */
-    assignDrop: function (domNodes) {
-      if (typeof domNodes.length === 'undefined') {
-        domNodes = [domNodes];
-      }
-      each(domNodes, function (domNode) {
-        domNode.addEventListener('dragover', this.preventEvent, false);
-        domNode.addEventListener('dragenter', this.preventEvent, false);
-        domNode.addEventListener('drop', this.onDrop, false);
-      }, this);
-    },
-
-    /**
-     * Un-assign drop event from DOM nodes
-     * @function
-     * @param domNodes
-     */
-    unAssignDrop: function (domNodes) {
-      if (typeof domNodes.length === 'undefined') {
-        domNodes = [domNodes];
-      }
-      each(domNodes, function (domNode) {
-        domNode.removeEventListener('dragover', this.preventEvent);
-        domNode.removeEventListener('dragenter', this.preventEvent);
-        domNode.removeEventListener('drop', this.onDrop);
-      }, this);
-    },
-
-    /**
-     * Returns a boolean indicating whether or not the instance is currently
-     * uploading anything.
-     * @function
-     * @returns {boolean}
-     */
-    isUploading: function () {
-      var uploading = false;
-      each(this.files, function (file) {
-        if (file.isUploading()) {
-          uploading = true;
-          return false;
-        }
-      });
-      return uploading;
-    },
-
-    /**
-     * should upload next chunk
-     * @function
-     * @returns {boolean|number}
-     */
-    _shouldUploadNext: function () {
-      var num = 0;
-      var should = true;
-      var simultaneousUploads = this.opts.simultaneousUploads;
-      each(this.files, function (file) {
-        each(file.chunks, function(chunk) {
-          if (chunk.status() === 'uploading') {
-            num++;
-            if (num >= simultaneousUploads) {
-              should = false;
-              return false;
-            }
-          }
-        });
-      });
-      // if should is true then return uploading chunks's length
-      return should && num;
-    },
-
-    /**
-     * Start or resume uploading.
-     * @function
-     */
-    upload: function () {
-      // Make sure we don't start too many uploads at once
-      var ret = this._shouldUploadNext();
-      if (ret === false) {
-        return;
-      }
-      // Kick off the queue
-      this.fire('uploadStart');
-      var started = false;
-      for (var num = 1; num <= this.opts.simultaneousUploads - ret; num++) {
-        started = this.uploadNextChunk(true) || started;
-      }
-      if (!started) {
-        async(function () {
-          this.fire('complete');
-        }, this);
-      }
-    },
-
-    /**
-     * Resume uploading.
-     * @function
-     */
-    resume: function () {
-      each(this.files, function (file) {
-        if (!file.isComplete()) {
-          file.resume();
-        }
-      });
-    },
-
-    /**
-     * Pause uploading.
-     * @function
-     */
-    pause: function () {
-      each(this.files, function (file) {
-        file.pause();
-      });
-    },
-
-    /**
-     * Cancel upload of all FlowFile objects and remove them from the list.
-     * @function
-     */
-    cancel: function () {
-      for (var i = this.files.length - 1; i >= 0; i--) {
-        this.files[i].cancel();
-      }
-    },
-
-    /**
-     * Returns a number between 0 and 1 indicating the current upload progress
-     * of all files.
-     * @function
-     * @returns {number}
-     */
-    progress: function () {
-      var totalDone = 0;
-      var totalSize = 0;
-      // Resume all chunks currently being uploaded
-      each(this.files, function (file) {
-        totalDone += file.progress() * file.size;
-        totalSize += file.size;
-      });
-      return totalSize > 0 ? totalDone / totalSize : 0;
-    },
-
-    /**
-     * Add a HTML5 File object to the list of files.
-     * @function
-     * @param {File} file
-     * @param {Event} [event] event is optional
-     */
-    addFile: function (file, event) {
-      this.addFiles([file], event);
-    },
-
-    /**
-     * Add a HTML5 File object to the list of files.
-     * @function
-     * @param {FileList|Array} fileList
-     * @param {Event} [event] event is optional
-     */
-    addFiles: function (fileList, event) {
-      var files = [];
-      each(fileList, function (file) {
-        // https://github.com/flowjs/flow.js/issues/55
-        if ((!ie10plus || ie10plus && file.size > 0) && !(file.size % 4096 === 0 && (file.name === '.' || file.fileName === '.'))) {
-          var uniqueIdentifier = this.generateUniqueIdentifier(file);
-          if (this.opts.allowDuplicateUploads || !this.getFromUniqueIdentifier(uniqueIdentifier)) {
-            var f = new FlowFile(this, file, uniqueIdentifier);
-            if (this.fire('fileAdded', f, event)) {
-              files.push(f);
-            }
-          }
-        }
-      }, this);
-      if (this.fire('filesAdded', files, event)) {
-        each(files, function (file) {
-          if (this.opts.singleFile && this.files.length > 0) {
-            this.removeFile(this.files[0]);
-          }
-          this.files.push(file);
-        }, this);
-        this.fire('filesSubmitted', files, event);
-      }
-    },
-
-
-    /**
-     * Cancel upload of a specific FlowFile object from the list.
-     * @function
-     * @param {FlowFile} file
-     */
-    removeFile: function (file) {
-      for (var i = this.files.length - 1; i >= 0; i--) {
-        if (this.files[i] === file) {
-          this.files.splice(i, 1);
-          file.abort();
-          this.fire('fileRemoved', file);
-        }
-      }
-    },
-
-    /**
-     * Look up a FlowFile object by its unique identifier.
-     * @function
-     * @param {string} uniqueIdentifier
-     * @returns {boolean|FlowFile} false if file was not found
-     */
-    getFromUniqueIdentifier: function (uniqueIdentifier) {
-      var ret = false;
-      each(this.files, function (file) {
-        if (file.uniqueIdentifier === uniqueIdentifier) {
-          ret = file;
-        }
-      });
-      return ret;
-    },
-
-    /**
-     * Returns the total size of all files in bytes.
-     * @function
-     * @returns {number}
-     */
-    getSize: function () {
-      var totalSize = 0;
-      each(this.files, function (file) {
-        totalSize += file.size;
-      });
-      return totalSize;
-    },
-
-    /**
-     * Returns the total size uploaded of all files in bytes.
-     * @function
-     * @returns {number}
-     */
-    sizeUploaded: function () {
-      var size = 0;
-      each(this.files, function (file) {
-        size += file.sizeUploaded();
-      });
-      return size;
-    },
-
-    /**
-     * Returns remaining time to upload all files in seconds. Accuracy is based on average speed.
-     * If speed is zero, time remaining will be equal to positive infinity `Number.POSITIVE_INFINITY`
-     * @function
-     * @returns {number}
-     */
-    timeRemaining: function () {
-      var sizeDelta = 0;
-      var averageSpeed = 0;
-      each(this.files, function (file) {
-        if (!file.paused && !file.error) {
-          sizeDelta += file.size - file.sizeUploaded();
-          averageSpeed += file.averageSpeed;
-        }
-      });
-      if (sizeDelta && !averageSpeed) {
-        return Number.POSITIVE_INFINITY;
-      }
-      if (!sizeDelta && !averageSpeed) {
-        return 0;
-      }
-      return Math.floor(sizeDelta / averageSpeed);
-    }
-  };
-
-
-
-
-
-
-  /**
-   * FlowFile class
-   * @name FlowFile
-   * @param {Flow} flowObj
-   * @param {File} file
-   * @param {string} uniqueIdentifier
-   * @constructor
-   */
-  function FlowFile(flowObj, file, uniqueIdentifier) {
-
-    /**
-     * Reference to parent Flow instance
-     * @type {Flow}
-     */
-    this.flowObj = flowObj;
-
-    /**
-     * Used to store the bytes read
-     * @type {Blob|string}
-     */
-    this.bytes = null;
-
-    /**
-     * Reference to file
-     * @type {File}
-     */
-    this.file = file;
-
-    /**
-     * File name. Some confusion in different versions of Firefox
-     * @type {string}
-     */
-    this.name = file.fileName || file.name;
-
-    /**
-     * File size
-     * @type {number}
-     */
-    this.size = file.size;
-
-    /**
-     * Relative file path
-     * @type {string}
-     */
-    this.relativePath = file.relativePath || file.webkitRelativePath || this.name;
-
-    /**
-     * File unique identifier
-     * @type {string}
-     */
-    this.uniqueIdentifier = (uniqueIdentifier === undefined ? flowObj.generateUniqueIdentifier(file) : uniqueIdentifier);
-
-    /**
-     * List of chunks
-     * @type {Array.<FlowChunk>}
-     */
-    this.chunks = [];
-
-    /**
-     * Indicated if file is paused
-     * @type {boolean}
-     */
-    this.paused = false;
-
-    /**
-     * Indicated if file has encountered an error
-     * @type {boolean}
-     */
-    this.error = false;
-
-    /**
-     * Average upload speed
-     * @type {number}
-     */
-    this.averageSpeed = 0;
-
-    /**
-     * Current upload speed
-     * @type {number}
-     */
-    this.currentSpeed = 0;
-
-    /**
-     * Date then progress was called last time
-     * @type {number}
-     * @private
-     */
-    this._lastProgressCallback = Date.now();
-
-    /**
-     * Previously uploaded file size
-     * @type {number}
-     * @private
-     */
-    this._prevUploadedSize = 0;
-
-    /**
-     * Holds previous progress
-     * @type {number}
-     * @private
-     */
-    this._prevProgress = 0;
-
-    this.bootstrap();
-  }
-
-  FlowFile.prototype = {
-    /**
-     * Update speed parameters
-     * @link http://stackoverflow.com/questions/2779600/how-to-estimate-download-time-remaining-accurately
-     * @function
-     */
-    measureSpeed: function () {
-      var timeSpan = Date.now() - this._lastProgressCallback;
-      if (!timeSpan) {
-        return ;
-      }
-      var smoothingFactor = this.flowObj.opts.speedSmoothingFactor;
-      var uploaded = this.sizeUploaded();
-      // Prevent negative upload speed after file upload resume
-      this.currentSpeed = Math.max((uploaded - this._prevUploadedSize) / timeSpan * 1000, 0);
-      this.averageSpeed = smoothingFactor * this.currentSpeed + (1 - smoothingFactor) * this.averageSpeed;
-      this._prevUploadedSize = uploaded;
-    },
-
-    /**
-     * For internal usage only.
-     * Callback when something happens within the chunk.
-     * @function
-     * @param {FlowChunk} chunk
-     * @param {string} event can be 'progress', 'success', 'error' or 'retry'
-     * @param {string} [message]
-     */
-    chunkEvent: function (chunk, event, message) {
-      switch (event) {
-        case 'progress':
-          if (Date.now() - this._lastProgressCallback <
-            this.flowObj.opts.progressCallbacksInterval) {
-            break;
-          }
-          this.measureSpeed();
-          this.flowObj.fire('fileProgress', this, chunk);
-          this.flowObj.fire('progress');
-          this._lastProgressCallback = Date.now();
-          break;
-        case 'error':
-          this.error = true;
-          this.abort(true);
-          this.flowObj.fire('fileError', this, message, chunk);
-          this.flowObj.fire('error', message, this, chunk);
-          break;
-        case 'success':
-          if (this.error) {
-            return;
-          }
-          this.measureSpeed();
-          this.flowObj.fire('fileProgress', this, chunk);
-          this.flowObj.fire('progress');
-          this._lastProgressCallback = Date.now();
-          if (this.isComplete()) {
-            this.currentSpeed = 0;
-            this.averageSpeed = 0;
-            this.flowObj.fire('fileSuccess', this, message, chunk);
-          }
-          break;
-        case 'retry':
-          this.flowObj.fire('fileRetry', this, chunk);
-          break;
-      }
-    },
-
-    /**
-     * Pause file upload
-     * @function
-     */
-    pause: function() {
-      this.paused = true;
-      this.abort();
-    },
-
-    /**
-     * Resume file upload
-     * @function
-     */
-    resume: function() {
-      this.paused = false;
-      this.flowObj.upload();
-    },
-
-    /**
-     * Abort current upload
-     * @function
-     */
-    abort: function (reset) {
-      this.currentSpeed = 0;
-      this.averageSpeed = 0;
-      var chunks = this.chunks;
-      if (reset) {
-        this.chunks = [];
-      }
-      each(chunks, function (c) {
-        if (c.status() === 'uploading') {
-          c.abort();
-          this.flowObj.uploadNextChunk();
-        }
-      }, this);
-    },
-
-    /**
-     * Cancel current upload and remove from a list
-     * @function
-     */
-    cancel: function () {
-      this.flowObj.removeFile(this);
-    },
-
-    /**
-     * Retry aborted file upload
-     * @function
-     */
-    retry: function () {
-      this.bootstrap();
-      this.flowObj.upload();
-    },
-
-    /**
-     * Clear current chunks and slice file again
-     * @function
-     */
-    bootstrap: function () {
-      if (typeof this.flowObj.opts.initFileFn === "function") {
-        this.flowObj.opts.initFileFn(this);
-      }
-
-      this.abort(true);
-      this.error = false;
-      // Rebuild stack of chunks from file
-      this._prevProgress = 0;
-      var round = this.flowObj.opts.forceChunkSize ? Math.ceil : Math.floor;
-      var chunks = Math.max(
-        round(this.size / this.flowObj.opts.chunkSize), 1
-      );
-      for (var offset = 0; offset < chunks; offset++) {
-        this.chunks.push(
-          new FlowChunk(this.flowObj, this, offset)
-        );
-      }
-    },
-
-    /**
-     * Get current upload progress status
-     * @function
-     * @returns {number} from 0 to 1
-     */
-    progress: function () {
-      if (this.error) {
-        return 1;
-      }
-      if (this.chunks.length === 1) {
-        this._prevProgress = Math.max(this._prevProgress, this.chunks[0].progress());
-        return this._prevProgress;
-      }
-      // Sum up progress across everything
-      var bytesLoaded = 0;
-      each(this.chunks, function (c) {
-        // get chunk progress relative to entire file
-        bytesLoaded += c.progress() * (c.endByte - c.startByte);
-      });
-      var percent = bytesLoaded / this.size;
-      // We don't want to lose percentages when an upload is paused
-      this._prevProgress = Math.max(this._prevProgress, percent > 0.9999 ? 1 : percent);
-      return this._prevProgress;
-    },
-
-    /**
-     * Indicates if file is being uploaded at the moment
-     * @function
-     * @returns {boolean}
-     */
-    isUploading: function () {
-      var uploading = false;
-      each(this.chunks, function (chunk) {
-        if (chunk.status() === 'uploading') {
-          uploading = true;
-          return false;
-        }
-      });
-      return uploading;
-    },
-
-    /**
-     * Indicates if file is has finished uploading and received a response
-     * @function
-     * @returns {boolean}
-     */
-    isComplete: function () {
-      var outstanding = false;
-      each(this.chunks, function (chunk) {
-        var status = chunk.status();
-        if (status === 'pending' || status === 'uploading' || status === 'reading' || chunk.preprocessState === 1 || chunk.readState === 1) {
-          outstanding = true;
-          return false;
-        }
-      });
-      return !outstanding;
-    },
-
-    /**
-     * Count total size uploaded
-     * @function
-     * @returns {number}
-     */
-    sizeUploaded: function () {
-      var size = 0;
-      each(this.chunks, function (chunk) {
-        size += chunk.sizeUploaded();
-      });
-      return size;
-    },
-
-    /**
-     * Returns remaining time to finish upload file in seconds. Accuracy is based on average speed.
-     * If speed is zero, time remaining will be equal to positive infinity `Number.POSITIVE_INFINITY`
-     * @function
-     * @returns {number}
-     */
-    timeRemaining: function () {
-      if (this.paused || this.error) {
-        return 0;
-      }
-      var delta = this.size - this.sizeUploaded();
-      if (delta && !this.averageSpeed) {
-        return Number.POSITIVE_INFINITY;
-      }
-      if (!delta && !this.averageSpeed) {
-        return 0;
-      }
-      return Math.floor(delta / this.averageSpeed);
-    },
-
-    /**
-     * Get file type
-     * @function
-     * @returns {string}
-     */
-    getType: function () {
-      return this.file.type && this.file.type.split('/')[1];
-    },
-
-    /**
-     * Get file extension
-     * @function
-     * @returns {string}
-     */
-    getExtension: function () {
-      return this.name.substr((~-this.name.lastIndexOf(".") >>> 0) + 2).toLowerCase();
-    }
-  };
-
-  /**
-   * Default read function using the webAPI
-   *
-   * @function webAPIFileRead(fileObj, startByte, endByte, fileType, chunk)
-   *
-   */
-  function webAPIFileRead(fileObj, startByte, endByte, fileType, chunk) {
-    var function_name = 'slice';
-
-    if (fileObj.file.slice)
-      function_name =  'slice';
-    else if (fileObj.file.mozSlice)
-      function_name = 'mozSlice';
-    else if (fileObj.file.webkitSlice)
-      function_name = 'webkitSlice';
-
-    chunk.readFinished(fileObj.file[function_name](startByte, endByte, fileType));
-  }
-
-
-  /**
-   * Class for storing a single chunk
-   * @name FlowChunk
-   * @param {Flow} flowObj
-   * @param {FlowFile} fileObj
-   * @param {number} offset
-   * @constructor
-   */
-  function FlowChunk(flowObj, fileObj, offset) {
-
-    /**
-     * Reference to parent flow object
-     * @type {Flow}
-     */
-    this.flowObj = flowObj;
-
-    /**
-     * Reference to parent FlowFile object
-     * @type {FlowFile}
-     */
-    this.fileObj = fileObj;
-
-    /**
-     * File offset
-     * @type {number}
-     */
-    this.offset = offset;
-
-    /**
-     * Indicates if chunk existence was checked on the server
-     * @type {boolean}
-     */
-    this.tested = false;
-
-    /**
-     * Number of retries performed
-     * @type {number}
-     */
-    this.retries = 0;
-
-    /**
-     * Pending retry
-     * @type {boolean}
-     */
-    this.pendingRetry = false;
-
-    /**
-     * Preprocess state
-     * @type {number} 0 = unprocessed, 1 = processing, 2 = finished
-     */
-    this.preprocessState = 0;
-
-    /**
-     * Read state
-     * @type {number} 0 = not read, 1 = reading, 2 = finished
-     */
-    this.readState = 0;
-
-
-    /**
-     * Bytes transferred from total request size
-     * @type {number}
-     */
-    this.loaded = 0;
-
-    /**
-     * Total request size
-     * @type {number}
-     */
-    this.total = 0;
-
-    /**
-     * Size of a chunk
-     * @type {number}
-     */
-    this.chunkSize = this.flowObj.opts.chunkSize;
-
-    /**
-     * Chunk start byte in a file
-     * @type {number}
-     */
-    this.startByte = this.offset * this.chunkSize;
-
-    /**
-      * Compute the endbyte in a file
-      *
-      */
-    this.computeEndByte = function() {
-      var endByte = Math.min(this.fileObj.size, (this.offset + 1) * this.chunkSize);
-      if (this.fileObj.size - endByte < this.chunkSize && !this.flowObj.opts.forceChunkSize) {
-        // The last chunk will be bigger than the chunk size,
-        // but less than 2 * this.chunkSize
-        endByte = this.fileObj.size;
-      }
-      return endByte;
-    }
-
-    /**
-     * Chunk end byte in a file
-     * @type {number}
-     */
-    this.endByte = this.computeEndByte();
-
-    /**
-     * XMLHttpRequest
-     * @type {XMLHttpRequest}
-     */
-    this.xhr = null;
-
-    var $ = this;
-
-    /**
-     * Send chunk event
-     * @param event
-     * @param {...} args arguments of a callback
-     */
-    this.event = function (event, args) {
-      args = Array.prototype.slice.call(arguments);
-      args.unshift($);
-      $.fileObj.chunkEvent.apply($.fileObj, args);
-    };
-    /**
-     * Catch progress event
-     * @param {ProgressEvent} event
-     */
-    this.progressHandler = function(event) {
-      if (event.lengthComputable) {
-        $.loaded = event.loaded ;
-        $.total = event.total;
-      }
-      $.event('progress', event);
-    };
-
-    /**
-     * Catch test event
-     * @param {Event} event
-     */
-    this.testHandler = function(event) {
-      var status = $.status(true);
-      if (status === 'error') {
-        $.event(status, $.message());
-        $.flowObj.uploadNextChunk();
-      } else if (status === 'success') {
-        $.tested = true;
-        $.event(status, $.message());
-        $.flowObj.uploadNextChunk();
-      } else if (!$.fileObj.paused) {
-        // Error might be caused by file pause method
-        // Chunks does not exist on the server side
-        $.tested = true;
-        $.send();
-      }
-    };
-
-    /**
-     * Upload has stopped
-     * @param {Event} event
-     */
-    this.doneHandler = function(event) {
-      var status = $.status();
-      if (status === 'success' || status === 'error') {
-        delete this.data;
-        $.event(status, $.message());
-        $.flowObj.uploadNextChunk();
-      } else {
-        $.event('retry', $.message());
-        $.pendingRetry = true;
-        $.abort();
-        $.retries++;
-        var retryInterval = $.flowObj.opts.chunkRetryInterval;
-        if (retryInterval !== null) {
-          setTimeout(function () {
-            $.send();
-          }, retryInterval);
-        } else {
-          $.send();
-        }
-      }
-    };
-  }
-
-  FlowChunk.prototype = {
-    /**
-     * Get params for a request
-     * @function
-     */
-    getParams: function () {
-      return {
-        flowChunkNumber: this.offset + 1,
-        flowChunkSize: this.flowObj.opts.chunkSize,
-        flowCurrentChunkSize: this.endByte - this.startByte,
-        flowTotalSize: this.fileObj.size,
-        flowIdentifier: this.fileObj.uniqueIdentifier,
-        flowFilename: this.fileObj.name,
-        flowRelativePath: this.fileObj.relativePath,
-        flowTotalChunks: this.fileObj.chunks.length
-      };
-    },
-
-    /**
-     * Get target option with query params
-     * @function
-     * @param params
-     * @returns {string}
-     */
-    getTarget: function(target, params){
-      if(target.indexOf('?') < 0) {
-        target += '?';
-      } else {
-        target += '&';
-      }
-      return target + params.join('&');
-    },
-
-    /**
-     * Makes a GET request without any data to see if the chunk has already
-     * been uploaded in a previous session
-     * @function
-     */
-    test: function () {
-      // Set up request and listen for event
-      this.xhr = new XMLHttpRequest();
-      this.xhr.addEventListener("load", this.testHandler, false);
-      this.xhr.addEventListener("error", this.testHandler, false);
-      var testMethod = evalOpts(this.flowObj.opts.testMethod, this.fileObj, this);
-      var data = this.prepareXhrRequest(testMethod, true);
-      this.xhr.send(data);
-    },
-
-    /**
-     * Finish preprocess state
-     * @function
-     */
-    preprocessFinished: function () {
-      // Re-compute the endByte after the preprocess function to allow an
-      // implementer of preprocess to set the fileObj size
-      this.endByte = this.computeEndByte();
-
-      this.preprocessState = 2;
-      this.send();
-    },
-
-    /**
-     * Finish read state
-     * @function
-     */
-    readFinished: function (bytes) {
-      this.readState = 2;
-      this.bytes = bytes;
-      this.send();
-    },
-
-
-    /**
-     * Uploads the actual data in a POST call
-     * @function
-     */
-    send: function () {
-      var preprocess = this.flowObj.opts.preprocess;
-      var read = this.flowObj.opts.readFileFn;
-      if (typeof preprocess === 'function') {
-        switch (this.preprocessState) {
-          case 0:
-            this.preprocessState = 1;
-            preprocess(this);
-            return;
-          case 1:
-            return;
-        }
-      }
-      switch (this.readState) {
-        case 0:
-          this.readState = 1;
-          read(this.fileObj, this.startByte, this.endByte, this.fileObj.file.type, this);
-          return;
-        case 1:
-          return;
-      }
-      if (this.flowObj.opts.testChunks && !this.tested) {
-        this.test();
-        return;
-      }
-
-      this.loaded = 0;
-      this.total = 0;
-      this.pendingRetry = false;
-
-      // Set up request and listen for event
-      this.xhr = new XMLHttpRequest();
-      this.xhr.upload.addEventListener('progress', this.progressHandler, false);
-      this.xhr.addEventListener("load", this.doneHandler, false);
-      this.xhr.addEventListener("error", this.doneHandler, false);
-
-      var uploadMethod = evalOpts(this.flowObj.opts.uploadMethod, this.fileObj, this);
-      var data = this.prepareXhrRequest(uploadMethod, false, this.flowObj.opts.method, this.bytes);
-      this.xhr.send(data);
-    },
-
-    /**
-     * Abort current xhr request
-     * @function
-     */
-    abort: function () {
-      // Abort and reset
-      var xhr = this.xhr;
-      this.xhr = null;
-      if (xhr) {
-        xhr.abort();
-      }
-    },
-
-    /**
-     * Retrieve current chunk upload status
-     * @function
-     * @returns {string} 'pending', 'uploading', 'success', 'error'
-     */
-    status: function (isTest) {
-      if (this.readState === 1) {
-        return 'reading';
-      } else if (this.pendingRetry || this.preprocessState === 1) {
-        // if pending retry then that's effectively the same as actively uploading,
-        // there might just be a slight delay before the retry starts
-        return 'uploading';
-      } else if (!this.xhr) {
-        return 'pending';
-      } else if (this.xhr.readyState < 4) {
-        // Status is really 'OPENED', 'HEADERS_RECEIVED'
-        // or 'LOADING' - meaning that stuff is happening
-        return 'uploading';
-      } else {
-        if (this.flowObj.opts.successStatuses.indexOf(this.xhr.status) > -1) {
-          // HTTP 200, perfect
-		      // HTTP 202 Accepted - The request has been accepted for processing, but the processing has not been completed.
-          return 'success';
-        } else if (this.flowObj.opts.permanentErrors.indexOf(this.xhr.status) > -1 ||
-            !isTest && this.retries >= this.flowObj.opts.maxChunkRetries) {
-          // HTTP 413/415/500/501, permanent error
-          return 'error';
-        } else {
-          // this should never happen, but we'll reset and queue a retry
-          // a likely case for this would be 503 service unavailable
-          this.abort();
-          return 'pending';
-        }
-      }
-    },
-
-    /**
-     * Get response from xhr request
-     * @function
-     * @returns {String}
-     */
-    message: function () {
-      return this.xhr ? this.xhr.responseText : '';
-    },
-
-    /**
-     * Get upload progress
-     * @function
-     * @returns {number}
-     */
-    progress: function () {
-      if (this.pendingRetry) {
-        return 0;
-      }
-      var s = this.status();
-      if (s === 'success' || s === 'error') {
-        return 1;
-      } else if (s === 'pending') {
-        return 0;
-      } else {
-        return this.total > 0 ? this.loaded / this.total : 0;
-      }
-    },
-
-    /**
-     * Count total size uploaded
-     * @function
-     * @returns {number}
-     */
-    sizeUploaded: function () {
-      var size = this.endByte - this.startByte;
-      // can't return only chunk.loaded value, because it is bigger than chunk size
-      if (this.status() !== 'success') {
-        size = this.progress() * size;
-      }
-      return size;
-    },
-
-    /**
-     * Prepare Xhr request. Set query, headers and data
-     * @param {string} method GET or POST
-     * @param {bool} isTest is this a test request
-     * @param {string} [paramsMethod] octet or form
-     * @param {Blob} [blob] to send
-     * @returns {FormData|Blob|Null} data to send
-     */
-    prepareXhrRequest: function(method, isTest, paramsMethod, blob) {
-      // Add data from the query options
-      var query = evalOpts(this.flowObj.opts.query, this.fileObj, this, isTest);
-      query = extend(query, this.getParams());
-
-      var target = evalOpts(this.flowObj.opts.target, this.fileObj, this, isTest);
-      var data = null;
-      if (method === 'GET' || paramsMethod === 'octet') {
-        // Add data from the query options
-        var params = [];
-        each(query, function (v, k) {
-          params.push([encodeURIComponent(k), encodeURIComponent(v)].join('='));
-        });
-        target = this.getTarget(target, params);
-        data = blob || null;
-      } else {
-        // Add data from the query options
-        data = new FormData();
-        each(query, function (v, k) {
-          data.append(k, v);
-        });
-        if (typeof blob !== "undefined") data.append(this.flowObj.opts.fileParameterName, blob, this.fileObj.file.name);
-      }
-
-      this.xhr.open(method, target, true);
-      this.xhr.withCredentials = this.flowObj.opts.withCredentials;
-
-      // Add data from header options
-      each(evalOpts(this.flowObj.opts.headers, this.fileObj, this, isTest), function (v, k) {
-        this.xhr.setRequestHeader(k, v);
-      }, this);
-
-      return data;
-    }
-  };
-
-  /**
-   * Remove value from array
-   * @param array
-   * @param value
-   */
-  function arrayRemove(array, value) {
-    var index = array.indexOf(value);
-    if (index > -1) {
-      array.splice(index, 1);
-    }
-  }
-
-  /**
-   * If option is a function, evaluate it with given params
-   * @param {*} data
-   * @param {...} args arguments of a callback
-   * @returns {*}
-   */
-  function evalOpts(data, args) {
-    if (typeof data === "function") {
-      // `arguments` is an object, not array, in FF, so:
-      args = Array.prototype.slice.call(arguments);
-      data = data.apply(null, args.slice(1));
-    }
-    return data;
-  }
-  Flow.evalOpts = evalOpts;
-
-  /**
-   * Execute function asynchronously
-   * @param fn
-   * @param context
-   */
-  function async(fn, context) {
-    setTimeout(fn.bind(context), 0);
-  }
-
-  /**
-   * Extends the destination object `dst` by copying all of the properties from
-   * the `src` object(s) to `dst`. You can specify multiple `src` objects.
-   * @function
-   * @param {Object} dst Destination object.
-   * @param {...Object} src Source object(s).
-   * @returns {Object} Reference to `dst`.
-   */
-  function extend(dst, src) {
-    each(arguments, function(obj) {
-      if (obj !== dst) {
-        each(obj, function(value, key){
-          dst[key] = value;
-        });
-      }
-    });
-    return dst;
-  }
-  Flow.extend = extend;
-
-  /**
-   * Iterate each element of an object
-   * @function
-   * @param {Array|Object} obj object or an array to iterate
-   * @param {Function} callback first argument is a value and second is a key.
-   * @param {Object=} context Object to become context (`this`) for the iterator function.
-   */
-  function each(obj, callback, context) {
-    if (!obj) {
-      return ;
-    }
-    var key;
-    // Is Array?
-    // Array.isArray won't work, not only arrays can be iterated by index https://github.com/flowjs/ng-flow/issues/236#
-    if (typeof(obj.length) !== 'undefined') {
-      for (key = 0; key < obj.length; key++) {
-        if (callback.call(context, obj[key], key) === false) {
-          return ;
-        }
-      }
-    } else {
-      for (key in obj) {
-        if (obj.hasOwnProperty(key) && callback.call(context, obj[key], key) === false) {
-          return ;
-        }
-      }
-    }
-  }
-  Flow.each = each;
-
-  /**
-   * FlowFile constructor
-   * @type {FlowFile}
-   */
-  Flow.FlowFile = FlowFile;
-
-  /**
-   * FlowFile constructor
-   * @type {FlowChunk}
-   */
-  Flow.FlowChunk = FlowChunk;
-
-  /**
-   * Library version
-   * @type {string}
-   */
-  Flow.version = '2.13.0';
-
-  if ( typeof module === "object" && module && typeof module.exports === "object" ) {
-    // Expose Flow as module.exports in loaders that implement the Node
-    // module pattern (including browserify). Do not create the global, since
-    // the user will be storing it themselves locally, and globals are frowned
-    // upon in the Node module world.
-    module.exports = Flow;
-  } else {
-    // Otherwise expose Flow to the global object as usual
-    window.Flow = Flow;
-
-    // Register as a named AMD module, since Flow can be concatenated with other
-    // files that may use define, but not via a proper concatenation script that
-    // understands anonymous AMD modules. A named AMD is safest and most robust
-    // way to register. Lowercase flow is used because AMD module names are
-    // derived from file names, and Flow is normally delivered in a lowercase
-    // file name. Do this after creating the global so that if an AMD module wants
-    // to call noConflict to hide this version of Flow, it will work.
-    if ( typeof define === "function" && define.amd ) {
-      define( "flow", [], function () { return Flow; } );
-    }
-  }
-})(window, document);
-
-/**
- * @description
- * var app = angular.module('App', ['flow.provider'], function(flowFactoryProvider){
- *    flowFactoryProvider.defaults = {target: '/'};
- * });
- * @name flowFactoryProvider
- */
-angular.module('flow.provider', [])
-.provider('flowFactory', function() {
-  'use strict';
-  /**
-   * Define the default properties for flow.js
-   * @name flowFactoryProvider.defaults
-   * @type {Object}
-   */
-  this.defaults = {};
-
-  /**
-   * Flow, MaybeFlow or NotFlow
-   * @name flowFactoryProvider.factory
-   * @type {function}
-   * @return {Flow}
-   */
-  this.factory = function (options) {
-    return new Flow(options);
-  };
-
-  /**
-   * Define the default events
-   * @name flowFactoryProvider.events
-   * @type {Array}
-   * @private
-   */
-  this.events = [];
-
-  /**
-   * Add default events
-   * @name flowFactoryProvider.on
-   * @function
-   * @param {string} event
-   * @param {Function} callback
-   */
-  this.on = function (event, callback) {
-    this.events.push([event, callback]);
-  };
-
-  this.$get = function() {
-    var fn = this.factory;
-    var defaults = this.defaults;
-    var events = this.events;
-    return {
-      'create': function(opts) {
-        // combine default options with global options and options
-        var flow = fn(angular.extend({}, defaults, opts));
-        angular.forEach(events, function (event) {
-          flow.on(event[0], event[1]);
-        });
-        return flow;
-      }
-    };
-  };
-});
-angular.module('flow.init', ['flow.provider'])
-  .controller('flowCtrl', ['$scope', '$attrs', '$parse', 'flowFactory',
-  function ($scope, $attrs, $parse, flowFactory) {
-
-    var options = angular.extend({}, $scope.$eval($attrs.flowInit));
-
-    // use existing flow object or create a new one
-    var flow  = $scope.$eval($attrs.flowObject) || flowFactory.create(options);
-
-    var catchAllHandler = function(eventName){
-      var args = Array.prototype.slice.call(arguments);
-      args.shift();
-      var event = $scope.$broadcast.apply($scope, ['flow::' + eventName, flow].concat(args));
-      if ({
-        'progress':1, 'filesSubmitted':1, 'fileSuccess': 1, 'fileError': 1, 'complete': 1
-      }[eventName]) {
-        $scope.$apply();
-      }
-      if (event.defaultPrevented) {
-        return false;
-      }
-    };
-
-    flow.on('catchAll', catchAllHandler);
-    $scope.$on('$destroy', function(){
-        flow.off('catchAll', catchAllHandler);
-    });
-
-    $scope.$flow = flow;
-
-    if ($attrs.hasOwnProperty('flowName')) {
-      $parse($attrs.flowName).assign($scope, flow);
-      $scope.$on('$destroy', function () {
-        $parse($attrs.flowName).assign($scope);
-      });
-    }
-  }])
-  .directive('flowInit', [function() {
-    return {
-      scope: true,
-      controller: 'flowCtrl'
-    };
-  }]);
-angular.module('flow.btn', ['flow.init'])
-.directive('flowBtn', [function() {
-  return {
-    'restrict': 'EA',
-    'scope': false,
-    'require': '^flowInit',
-    'link': function(scope, element, attrs) {
-      var isDirectory = attrs.hasOwnProperty('flowDirectory');
-      var isSingleFile = attrs.hasOwnProperty('flowSingleFile');
-      var inputAttrs = attrs.hasOwnProperty('flowAttrs') && scope.$eval(attrs.flowAttrs);
-      scope.$flow.assignBrowse(element, isDirectory, isSingleFile, inputAttrs);
-    }
-  };
-}]);
-angular.module('flow.dragEvents', ['flow.init'])
-/**
- * @name flowPreventDrop
- * Prevent loading files then dropped on element
- */
-  .directive('flowPreventDrop', function() {
-    return {
-      'scope': false,
-      'link': function(scope, element, attrs) {
-        element.bind('drop dragover', function (event) {
-          event.preventDefault();
-        });
-      }
-    };
-  })
-/**
- * @name flowDragEnter
- * executes `flowDragEnter` and `flowDragLeave` events
- */
-  .directive('flowDragEnter', ['$timeout', function($timeout) {
-    return {
-      'scope': false,
-      'link': function(scope, element, attrs) {
-        var promise;
-        var enter = false;
-        element.bind('dragover', function (event) {
-          if (!isFileDrag(event)) {
-            return ;
-          }
-          if (!enter) {
-            scope.$apply(attrs.flowDragEnter);
-            enter = true;
-          }
-          $timeout.cancel(promise);
-          event.preventDefault();
-        });
-        element.bind('dragleave drop', function (event) {
-          $timeout.cancel(promise);
-          promise = $timeout(function () {
-            scope.$eval(attrs.flowDragLeave);
-            promise = null;
-            enter = false;
-          }, 100);
-        });
-        function isFileDrag(dragEvent) {
-          var fileDrag = false;
-          var dataTransfer = dragEvent.dataTransfer || dragEvent.originalEvent.dataTransfer;
-          angular.forEach(dataTransfer && dataTransfer.types, function(val) {
-            if (val === 'Files') {
-              fileDrag = true;
-            }
-          });
-          return fileDrag;
-        }
-      }
-    };
-  }]);
-
-angular.module('flow.drop', ['flow.init'])
-.directive('flowDrop', function() {
-  return {
-    'scope': false,
-    'require': '^flowInit',
-    'link': function(scope, element, attrs) {
-      if (attrs.flowDropEnabled) {
-        scope.$watch(attrs.flowDropEnabled, function (value) {
-          if (value) {
-            assignDrop();
-          } else {
-            unAssignDrop();
-          }
-        });
-      } else {
-        assignDrop();
-      }
-      function assignDrop() {
-        scope.$flow.assignDrop(element);
-      }
-      function unAssignDrop() {
-        scope.$flow.unAssignDrop(element);
-      }
-    }
-  };
-});
-
-!function (angular) {'use strict';
-  var module = angular.module('flow.events', ['flow.init']);
-  var events = {
-    fileSuccess: ['$file', '$message'],
-    fileProgress: ['$file'],
-    fileAdded: ['$file', '$event'],
-    filesAdded: ['$files', '$event'],
-    filesSubmitted: ['$files', '$event'],
-    fileRetry: ['$file'],
-    fileRemoved: ['$file'],
-    fileError: ['$file', '$message'],
-    uploadStart: [],
-    complete: [],
-    progress: [],
-    error: ['$message', '$file']
-  };
-
-  angular.forEach(events, function (eventArgs, eventName) {
-    var name = 'flow' + capitaliseFirstLetter(eventName);
-    if (name == 'flowUploadStart') {
-      name = 'flowUploadStarted';// event alias
-    }
-    module.directive(name, [function() {
-      return {
-        require: '^flowInit',
-        controller: ['$scope', '$attrs', function ($scope, $attrs) {
-          $scope.$on('flow::' + eventName, function () {
-            var funcArgs = Array.prototype.slice.call(arguments);
-            var event = funcArgs.shift();// remove angular event
-            // remove flow object and ignore event if it is from parent directive
-            if ($scope.$flow !== funcArgs.shift()) {
-              return ;
-            }
-            var args = {};
-            angular.forEach(eventArgs, function(value, key) {
-              args[value] = funcArgs[key];
-            });
-            if ($scope.$eval($attrs[name], args) === false) {
-              event.preventDefault();
-            }
-          });
-        }]
-      };
-    }]);
-  });
-
-  function capitaliseFirstLetter(string) {
-    return string.charAt(0).toUpperCase() + string.slice(1);
-  }
-}(angular);
-
-angular.module('flow.img', ['flow.init'])
-.directive('flowImg', [function() {
-  return {
-    'scope': false,
-    'require': '^flowInit',
-    'link': function(scope, element, attrs) {
-      var file = attrs.flowImg;
-      scope.$watch(file, function (file) {
-        if (!file) {
-          return ;
-        }
-        var fileReader = new FileReader();
-        fileReader.readAsDataURL(file.file);
-        fileReader.onload = function (event) {
-          scope.$apply(function () {
-            attrs.$set('src', event.target.result);
-          });
-        };
-      });
-    }
-  };
-}]);
-angular.module('flow.transfers', ['flow.init'])
-.directive('flowTransfers', [function() {
-  return {
-    'scope': true,
-    'require': '^flowInit',
-    'link': function(scope) {
-      scope.transfers = scope.$flow.files;
-    }
-  };
-}]);
-angular.module('flow', ['flow.provider', 'flow.init', 'flow.events', 'flow.btn',
-  'flow.drop', 'flow.transfers', 'flow.img', 'flow.dragEvents']);
\ No newline at end of file
+/*! ng-flow 2.6.1 */
+!function(a,b,c){"use strict";function d(b){if(this.support=!("undefined"==typeof File||"undefined"==typeof Blob||"undefined"==typeof FileList||!Blob.prototype.slice&&!Blob.prototype.webkitSlice&&!Blob.prototype.mozSlice),this.support){this.supportDirectory=/WebKit/.test(a.navigator.userAgent),this.files=[],this.defaults={chunkSize:1048576,forceChunkSize:!1,simultaneousUploads:3,singleFile:!1,fileParameterName:"file",progressCallbacksInterval:500,speedSmoothingFactor:.1,query:{},headers:{},withCredentials:!1,preprocess:null,method:"multipart",testMethod:"GET",uploadMethod:"POST",prioritizeFirstAndLastChunk:!1,target:"/",testChunks:!0,generateUniqueIdentifier:null,maxChunkRetries:0,chunkRetryInterval:null,permanentErrors:[404,415,500,501],successStatuses:[200,201,202],onDropStopPropagation:!1},this.opts={},this.events={};var c=this;this.onDrop=function(a){c.opts.onDropStopPropagation&&a.stopPropagation(),a.preventDefault();var b=a.dataTransfer;b.items&&b.items[0]&&b.items[0].webkitGetAsEntry?c.webkitReadDataTransfer(a):c.addFiles(b.files,a)},this.preventEvent=function(a){a.preventDefault()},this.opts=d.extend({},this.defaults,b||{})}}function e(a,b){this.flowObj=a,this.file=b,this.name=b.fileName||b.name,this.size=b.size,this.relativePath=b.relativePath||b.webkitRelativePath||this.name,this.uniqueIdentifier=a.generateUniqueIdentifier(b),this.chunks=[],this.paused=!1,this.error=!1,this.averageSpeed=0,this.currentSpeed=0,this._lastProgressCallback=Date.now(),this._prevUploadedSize=0,this._prevProgress=0,this.bootstrap()}function f(a,b,c){this.flowObj=a,this.fileObj=b,this.fileObjSize=b.size,this.offset=c,this.tested=!1,this.retries=0,this.pendingRetry=!1,this.preprocessState=0,this.loaded=0,this.total=0;var d=this.flowObj.opts.chunkSize;this.startByte=this.offset*d,this.endByte=Math.min(this.fileObjSize,(this.offset+1)*d),this.xhr=null,this.fileObjSize-this.endByte<d&&!this.flowObj.opts.forceChunkSize&&(this.endByte=this.fileObjSize);var e=this;this.event=function(a,b){b=Array.prototype.slice.call(arguments),b.unshift(e),e.fileObj.chunkEvent.apply(e.fileObj,b)},this.progressHandler=function(a){a.lengthComputable&&(e.loaded=a.loaded,e.total=a.total),e.event("progress",a)},this.testHandler=function(){var a=e.status(!0);"error"===a?(e.event(a,e.message()),e.flowObj.uploadNextChunk()):"success"===a?(e.tested=!0,e.event(a,e.message()),e.flowObj.uploadNextChunk()):e.fileObj.paused||(e.tested=!0,e.send())},this.doneHandler=function(){var a=e.status();if("success"===a||"error"===a)e.event(a,e.message()),e.flowObj.uploadNextChunk();else{e.event("retry",e.message()),e.pendingRetry=!0,e.abort(),e.retries++;var b=e.flowObj.opts.chunkRetryInterval;null!==b?setTimeout(function(){e.send()},b):e.send()}}}function g(a,b){var c=a.indexOf(b);c>-1&&a.splice(c,1)}function h(a,b){return"function"==typeof a&&(b=Array.prototype.slice.call(arguments),a=a.apply(null,b.slice(1))),a}function i(a,b){setTimeout(a.bind(b),0)}function j(a){return k(arguments,function(b){b!==a&&k(b,function(b,c){a[c]=b})}),a}function k(a,b,c){if(a){var d;if("undefined"!=typeof a.length){for(d=0;d<a.length;d++)if(b.call(c,a[d],d)===!1)return}else for(d in a)if(a.hasOwnProperty(d)&&b.call(c,a[d],d)===!1)return}}var l=a.navigator.msPointerEnabled;d.prototype={on:function(a,b){a=a.toLowerCase(),this.events.hasOwnProperty(a)||(this.events[a]=[]),this.events[a].push(b)},off:function(a,b){a!==c?(a=a.toLowerCase(),b!==c?this.events.hasOwnProperty(a)&&g(this.events[a],b):delete this.events[a]):this.events={}},fire:function(a,b){b=Array.prototype.slice.call(arguments),a=a.toLowerCase();var c=!1;return this.events.hasOwnProperty(a)&&k(this.events[a],function(a){c=a.apply(this,b.slice(1))===!1||c},this),"catchall"!=a&&(b.unshift("catchAll"),c=this.fire.apply(this,b)===!1||c),!c},webkitReadDataTransfer:function(a){function b(a){g+=a.length,k(a,function(a){if(a.isFile){var e=a.fullPath;a.file(function(a){c(a,e)},d)}else a.isDirectory&&a.createReader().readEntries(b,d)}),e()}function c(a,b){a.relativePath=b.substring(1),h.push(a),e()}function d(a){throw a}function e(){0==--g&&f.addFiles(h,a)}var f=this,g=a.dataTransfer.items.length,h=[];k(a.dataTransfer.items,function(a){var f=a.webkitGetAsEntry();return f?void(f.isFile?c(a.getAsFile(),f.fullPath):f.createReader().readEntries(b,d)):void e()})},generateUniqueIdentifier:function(a){var b=this.opts.generateUniqueIdentifier;if("function"==typeof b)return b(a);var c=a.relativePath||a.webkitRelativePath||a.fileName||a.name;return a.size+"-"+c.replace(/[^0-9a-zA-Z_-]/gim,"")},uploadNextChunk:function(a){var b=!1;if(this.opts.prioritizeFirstAndLastChunk&&(k(this.files,function(a){return!a.paused&&a.chunks.length&&"pending"===a.chunks[0].status()&&0===a.chunks[0].preprocessState?(a.chunks[0].send(),b=!0,!1):!a.paused&&a.chunks.length>1&&"pending"===a.chunks[a.chunks.length-1].status()&&0===a.chunks[0].preprocessState?(a.chunks[a.chunks.length-1].send(),b=!0,!1):void 0}),b))return b;if(k(this.files,function(a){return a.paused||k(a.chunks,function(a){return"pending"===a.status()&&0===a.preprocessState?(a.send(),b=!0,!1):void 0}),b?!1:void 0}),b)return!0;var c=!1;return k(this.files,function(a){return a.isComplete()?void 0:(c=!0,!1)}),c||a||i(function(){this.fire("complete")},this),!1},assignBrowse:function(a,c,d,e){"undefined"==typeof a.length&&(a=[a]),k(a,function(a){var f;"INPUT"===a.tagName&&"file"===a.type?f=a:(f=b.createElement("input"),f.setAttribute("type","file"),j(f.style,{visibility:"hidden",position:"absolute"}),a.appendChild(f),a.addEventListener("click",function(){f.click()},!1)),this.opts.singleFile||d||f.setAttribute("multiple","multiple"),c&&f.setAttribute("webkitdirectory","webkitdirectory"),k(e,function(a,b){f.setAttribute(b,a)});var g=this;f.addEventListener("change",function(a){g.addFiles(a.target.files,a),a.target.value=""},!1)},this)},assignDrop:function(a){"undefined"==typeof a.length&&(a=[a]),k(a,function(a){a.addEventListener("dragover",this.preventEvent,!1),a.addEventListener("dragenter",this.preventEvent,!1),a.addEventListener("drop",this.onDrop,!1)},this)},unAssignDrop:function(a){"undefined"==typeof a.length&&(a=[a]),k(a,function(a){a.removeEventListener("dragover",this.preventEvent),a.removeEventListener("dragenter",this.preventEvent),a.removeEventListener("drop",this.onDrop)},this)},isUploading:function(){var a=!1;return k(this.files,function(b){return b.isUploading()?(a=!0,!1):void 0}),a},_shouldUploadNext:function(){var a=0,b=!0,c=this.opts.simultaneousUploads;return k(this.files,function(d){k(d.chunks,function(d){return"uploading"===d.status()&&(a++,a>=c)?(b=!1,!1):void 0})}),b&&a},upload:function(){var a=this._shouldUploadNext();if(a!==!1){this.fire("uploadStart");for(var b=!1,c=1;c<=this.opts.simultaneousUploads-a;c++)b=this.uploadNextChunk(!0)||b;b||i(function(){this.fire("complete")},this)}},resume:function(){k(this.files,function(a){a.resume()})},pause:function(){k(this.files,function(a){a.pause()})},cancel:function(){for(var a=this.files.length-1;a>=0;a--)this.files[a].cancel()},progress:function(){var a=0,b=0;return k(this.files,function(c){a+=c.progress()*c.size,b+=c.size}),b>0?a/b:0},addFile:function(a,b){this.addFiles([a],b)},addFiles:function(a,b){var c=[];k(a,function(a){if((!l||l&&a.size>0)&&(a.size%4096!==0||"."!==a.name&&"."!==a.fileName)&&!this.getFromUniqueIdentifier(this.generateUniqueIdentifier(a))){var d=new e(this,a);this.fire("fileAdded",d,b)&&c.push(d)}},this),this.fire("filesAdded",c,b)&&k(c,function(a){this.opts.singleFile&&this.files.length>0&&this.removeFile(this.files[0]),this.files.push(a)},this),this.fire("filesSubmitted",c,b)},removeFile:function(a){for(var b=this.files.length-1;b>=0;b--)this.files[b]===a&&(this.files.splice(b,1),a.abort())},getFromUniqueIdentifier:function(a){var b=!1;return k(this.files,function(c){c.uniqueIdentifier===a&&(b=c)}),b},getSize:function(){var a=0;return k(this.files,function(b){a+=b.size}),a},sizeUploaded:function(){var a=0;return k(this.files,function(b){a+=b.sizeUploaded()}),a},timeRemaining:function(){var a=0,b=0;return k(this.files,function(c){c.paused||c.error||(a+=c.size-c.sizeUploaded(),b+=c.averageSpeed)}),a&&!b?Number.POSITIVE_INFINITY:a||b?Math.floor(a/b):0}},e.prototype={measureSpeed:function(){var a=Date.now()-this._lastProgressCallback;if(a){var b=this.flowObj.opts.speedSmoothingFactor,c=this.sizeUploaded();this.currentSpeed=Math.max((c-this._prevUploadedSize)/a*1e3,0),this.averageSpeed=b*this.currentSpeed+(1-b)*this.averageSpeed,this._prevUploadedSize=c}},chunkEvent:function(a,b,c){switch(b){case"progress":if(Date.now()-this._lastProgressCallback<this.flowObj.opts.progressCallbacksInterval)break;this.measureSpeed(),this.flowObj.fire("fileProgress",this,a),this.flowObj.fire("progress"),this._lastProgressCallback=Date.now();break;case"error":this.error=!0,this.abort(!0),this.flowObj.fire("fileError",this,c,a),this.flowObj.fire("error",c,this,a);break;case"success":if(this.error)return;this.measureSpeed(),this.flowObj.fire("fileProgress",this,a),this.flowObj.fire("progress"),this._lastProgressCallback=Date.now(),this.isComplete()&&(this.currentSpeed=0,this.averageSpeed=0,this.flowObj.fire("fileSuccess",this,c,a));break;case"retry":this.flowObj.fire("fileRetry",this,a)}},pause:function(){this.paused=!0,this.abort()},resume:function(){this.paused=!1,this.flowObj.upload()},abort:function(a){this.currentSpeed=0,this.averageSpeed=0;var b=this.chunks;a&&(this.chunks=[]),k(b,function(a){"uploading"===a.status()&&(a.abort(),this.flowObj.uploadNextChunk())},this)},cancel:function(){this.flowObj.removeFile(this)},retry:function(){this.bootstrap(),this.flowObj.upload()},bootstrap:function(){this.abort(!0),this.error=!1,this._prevProgress=0;for(var a=this.flowObj.opts.forceChunkSize?Math.ceil:Math.floor,b=Math.max(a(this.file.size/this.flowObj.opts.chunkSize),1),c=0;b>c;c++)this.chunks.push(new f(this.flowObj,this,c))},progress:function(){if(this.error)return 1;if(1===this.chunks.length)return this._prevProgress=Math.max(this._prevProgress,this.chunks[0].progress()),this._prevProgress;var a=0;k(this.chunks,function(b){a+=b.progress()*(b.endByte-b.startByte)});var b=a/this.size;return this._prevProgress=Math.max(this._prevProgress,b>.9999?1:b),this._prevProgress},isUploading:function(){var a=!1;return k(this.chunks,function(b){return"uploading"===b.status()?(a=!0,!1):void 0}),a},isComplete:function(){var a=!1;return k(this.chunks,function(b){var c=b.status();return"pending"===c||"uploading"===c||1===b.preprocessState?(a=!0,!1):void 0}),!a},sizeUploaded:function(){var a=0;return k(this.chunks,function(b){a+=b.sizeUploaded()}),a},timeRemaining:function(){if(this.paused||this.error)return 0;var a=this.size-this.sizeUploaded();return a&&!this.averageSpeed?Number.POSITIVE_INFINITY:a||this.averageSpeed?Math.floor(a/this.averageSpeed):0},getType:function(){return this.file.type&&this.file.type.split("/")[1]},getExtension:function(){return this.name.substr((~-this.name.lastIndexOf(".")>>>0)+2).toLowerCase()}},f.prototype={getParams:function(){return{flowChunkNumber:this.offset+1,flowChunkSize:this.flowObj.opts.chunkSize,flowCurrentChunkSize:this.endByte-this.startByte,flowTotalSize:this.fileObjSize,flowIdentifier:this.fileObj.uniqueIdentifier,flowFilename:this.fileObj.name,flowRelativePath:this.fileObj.relativePath,flowTotalChunks:this.fileObj.chunks.length}},getTarget:function(a,b){return a+=a.indexOf("?")<0?"?":"&",a+b.join("&")},test:function(){this.xhr=new XMLHttpRequest,this.xhr.addEventListener("load",this.testHandler,!1),this.xhr.addEventListener("error",this.testHandler,!1);var a=h(this.flowObj.opts.testMethod,this.fileObj,this),b=this.prepareXhrRequest(a,!0);this.xhr.send(b)},preprocessFinished:function(){this.preprocessState=2,this.send()},send:function(){var a=this.flowObj.opts.preprocess;if("function"==typeof a)switch(this.preprocessState){case 0:return this.preprocessState=1,void a(this);case 1:return}if(this.flowObj.opts.testChunks&&!this.tested)return void this.test();this.loaded=0,this.total=0,this.pendingRetry=!1;var b=this.fileObj.file.slice?"slice":this.fileObj.file.mozSlice?"mozSlice":this.fileObj.file.webkitSlice?"webkitSlice":"slice",c=this.fileObj.file[b](this.startByte,this.endByte,this.fileObj.file.type);this.xhr=new XMLHttpRequest,this.xhr.upload.addEventListener("progress",this.progressHandler,!1),this.xhr.addEventListener("load",this.doneHandler,!1),this.xhr.addEventListener("error",this.doneHandler,!1);var d=h(this.flowObj.opts.uploadMethod,this.fileObj,this),e=this.prepareXhrRequest(d,!1,this.flowObj.opts.method,c);this.xhr.send(e)},abort:function(){var a=this.xhr;this.xhr=null,a&&a.abort()},status:function(a){return this.pendingRetry||1===this.preprocessState?"uploading":this.xhr?this.xhr.readyState<4?"uploading":this.flowObj.opts.successStatuses.indexOf(this.xhr.status)>-1?"success":this.flowObj.opts.permanentErrors.indexOf(this.xhr.status)>-1||!a&&this.retries>=this.flowObj.opts.maxChunkRetries?"error":(this.abort(),"pending"):"pending"},message:function(){return this.xhr?this.xhr.responseText:""},progress:function(){if(this.pendingRetry)return 0;var a=this.status();return"success"===a||"error"===a?1:"pending"===a?0:this.total>0?this.loaded/this.total:0},sizeUploaded:function(){var a=this.endByte-this.startByte;return"success"!==this.status()&&(a=this.progress()*a),a},prepareXhrRequest:function(a,b,c,d){var e=h(this.flowObj.opts.query,this.fileObj,this,b);e=j(this.getParams(),e);var f=h(this.flowObj.opts.target,this.fileObj,this,b),g=null;if("GET"===a||"octet"===c){var i=[];k(e,function(a,b){i.push([encodeURIComponent(b),encodeURIComponent(a)].join("="))}),f=this.getTarget(f,i),g=d||null}else g=new FormData,k(e,function(a,b){g.append(b,a)}),g.append(this.flowObj.opts.fileParameterName,d,this.fileObj.file.name);return this.xhr.open(a,f,!0),this.xhr.withCredentials=this.flowObj.opts.withCredentials,k(h(this.flowObj.opts.headers,this.fileObj,this,b),function(a,b){this.xhr.setRequestHeader(b,a)},this),g}},d.evalOpts=h,d.extend=j,d.each=k,d.FlowFile=e,d.FlowChunk=f,d.version="2.9.0","object"==typeof module&&module&&"object"==typeof module.exports?module.exports=d:(a.Flow=d,"function"==typeof define&&define.amd&&define("flow",[],function(){return d}))}(window,document),angular.module("flow.provider",[]).provider("flowFactory",function(){"use strict";this.defaults={},this.factory=function(a){return new Flow(a)},this.events=[],this.on=function(a,b){this.events.push([a,b])},this.$get=function(){var a=this.factory,b=this.defaults,c=this.events;return{create:function(d){var e=a(angular.extend({},b,d));return angular.forEach(c,function(a){e.on(a[0],a[1])}),e}}}}),angular.module("flow.init",["flow.provider"]).controller("flowCtrl",["$scope","$attrs","$parse","flowFactory",function(a,b,c,d){var e=angular.extend({},a.$eval(b.flowInit)),f=a.$eval(b.flowObject)||d.create(e),g=function(b){var c=Array.prototype.slice.call(arguments);c.shift();var d=a.$broadcast.apply(a,["flow::"+b,f].concat(c));return{progress:1,filesSubmitted:1,fileSuccess:1,fileError:1,complete:1}[b]&&a.$apply(),d.defaultPrevented?!1:void 0};f.on("catchAll",g),a.$on("$destroy",function(){f.off("catchAll",g)}),a.$flow=f,b.hasOwnProperty("flowName")&&(c(b.flowName).assign(a,f),a.$on("$destroy",function(){c(b.flowName).assign(a)}))}]).directive("flowInit",[function(){return{scope:!0,controller:"flowCtrl"}}]),angular.module("flow.btn",["flow.init"]).directive("flowBtn",[function(){return{restrict:"EA",scope:!1,require:"^flowInit",link:function(a,b,c){var d=c.hasOwnProperty("flowDirectory"),e=c.hasOwnProperty("flowSingleFile"),f=c.hasOwnProperty("flowAttrs")&&a.$eval(c.flowAttrs);a.$flow.assignBrowse(b,d,e,f)}}}]),angular.module("flow.dragEvents",["flow.init"]).directive("flowPreventDrop",function(){return{scope:!1,link:function(a,b){b.bind("drop dragover",function(a){a.preventDefault()})}}}).directive("flowDragEnter",["$timeout",function(a){return{scope:!1,link:function(b,c,d){function e(a){var b=!1,c=a.dataTransfer||a.originalEvent.dataTransfer;return angular.forEach(c&&c.types,function(a){"Files"===a&&(b=!0)}),b}var f,g=!1;c.bind("dragover",function(c){e(c)&&(g||(b.$apply(d.flowDragEnter),g=!0),a.cancel(f),c.preventDefault())}),c.bind("dragleave drop",function(){a.cancel(f),f=a(function(){b.$eval(d.flowDragLeave),f=null,g=!1},100)})}}}]),angular.module("flow.drop",["flow.init"]).directive("flowDrop",function(){return{scope:!1,require:"^flowInit",link:function(a,b,c){function d(){a.$flow.assignDrop(b)}function e(){a.$flow.unAssignDrop(b)}c.flowDropEnabled?a.$watch(c.flowDropEnabled,function(a){a?d():e()}):d()}}}),!function(a){"use strict";function b(a){return a.charAt(0).toUpperCase()+a.slice(1)}var c=a.module("flow.events",["flow.init"]),d={fileSuccess:["$file","$message"],fileProgress:["$file"],fileAdded:["$file","$event"],filesAdded:["$files","$event"],filesSubmitted:["$files","$event"],fileRetry:["$file"],fileError:["$file","$message"],uploadStart:[],complete:[],progress:[],error:["$message","$file"]};a.forEach(d,function(d,e){var f="flow"+b(e);"flowUploadStart"==f&&(f="flowUploadStarted"),c.directive(f,[function(){return{require:"^flowInit",controller:["$scope","$attrs",function(b,c){b.$on("flow::"+e,function(){var e=Array.prototype.slice.call(arguments),g=e.shift();if(b.$flow===e.shift()){var h={};a.forEach(d,function(a,b){h[a]=e[b]}),b.$eval(c[f],h)===!1&&g.preventDefault()}})}]}}])})}(angular),angular.module("flow.img",["flow.init"]).directive("flowImg",[function(){return{scope:!1,require:"^flowInit",link:function(a,b,c){var d=c.flowImg;a.$watch(d,function(b){if(b){var d=new FileReader;d.readAsDataURL(b.file),d.onload=function(b){a.$apply(function(){c.$set("src",b.target.result)})}}})}}}]),angular.module("flow.transfers",["flow.init"]).directive("flowTransfers",[function(){return{scope:!0,require:"^flowInit",link:function(a){a.transfers=a.$flow.files}}}]),angular.module("flow",["flow.provider","flow.init","flow.events","flow.btn","flow.drop","flow.transfers","flow.img","flow.dragEvents"]);
diff --git a/js/script.js b/js/script.js
new file mode 100644
index 00000000..72087f95
--- /dev/null
+++ b/js/script.js
@@ -0,0 +1,12 @@
+$('li#app-navigation-entry-utils-create').on('click', function() {
+  $('li#app-navigation-entry-utils-add').addClass('editing');
+});
+
+$('li#app-navigation-entry-utils-add .icon-close').on('click', function () {
+  $('li#app-navigation-entry-utils-add').removeClass('editing');
+})
+
+$('li#app-navigation-entry-utils-add .icon-checkmark').on('click', function () {
+  // Ajouter la destination dans la bdd
+  $('li#app-navigation-entry-utils-add').removeClass('editing');
+})
diff --git a/l10n/fr.js b/l10n/fr.js
index 93b8bf9e..336f0f38 100644
--- a/l10n/fr.js
+++ b/l10n/fr.js
@@ -2,18 +2,25 @@ OC.L10N.register(
   "flowupload", {
     "FlowUpload" : "Envoyer des fichiers",
     "Select File": "Sélectionnez un fichier",
+    "New destination": "Nouvelle destination",
+    "Destination name": "Destination",
     "Select Folder": "Sélectionner le dossier",
     "... or drag and drop your files here" : "... ou déposez ici vos fichiers",
     "Transfers" : "Transferts",
     "Upload" : "Envoyer",
+    "Upload a file" : "Envoyer un fichier",
+    "Upload a whole folder" : "Envoyer un dossier",
     "Pause" : "Pause",
     "Cancel" : "Annuler",
-    "Uploading" : "Envoi en cours",
+    "Uploading" : "Envoie en cours",
+    "Waiting" : "En attente",
+    "Aborted" : "Annulé",
+    "Name" : "Nom du fichier",
     "Size" : "Taille",
     "Progress" : "Progression",
     "Retry" : "Réessayer",
     "Completed" : "Complété",
-    "The files will be saved in your home directory" : "Les fichiers seront sauvegardés dans votre dossier personnel"
+    "The files will be saved in your home directory." : "Les fichiers seront sauvegardés dans votre dossier personnel."
   },
   "nplurals=2; plural=(n > 1);"
 );
diff --git a/l10n/fr.json b/l10n/fr.json
index f7cde8a6..89a306fe 100644
--- a/l10n/fr.json
+++ b/l10n/fr.json
@@ -1,13 +1,20 @@
 { "translations": {
   "FlowUpload" : "Envoyer des fichiers",
   "Select File": "Sélectionnez un fichier",
+  "New destination": "Nouvelle destination",
+  "Destination name": "Destination",
   "Select Folder": "Sélectionner le dossier",
   "... or drag and drop your files here" : "... ou déposez ici vos fichiers",
   "Transfers" : "Transferts",
   "Upload" : "Envoyer",
+  "Upload a file" : "Envoyer un fichier",
+  "Upload a whole folder" : "Envoyer un dossier",
   "Pause" : "Pause",
   "Cancel" : "Annuler",
   "Uploading" : "Envoi en cours",
+  "Waiting" : "En attente",
+  "Aborted" : "Annulé",
+  "Name" : "Nom du fichier",
   "Size" : "Taille",
   "Progress" : "Progression",
   "Retry" : "Réessayer",
diff --git a/templates/main.php b/templates/main.php
index 327c3b63..7346d8a0 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -1,58 +1,79 @@
-<div ng-app="app" flow-init id="app" flow-prevent-drop ng-style="style" style="margin: 2em; width:auto">
+<div id="content" ng-app="app" class="app-files" role="main">
+  <div id="app-navigation">
+    <ul id="locations" class="with-icon" ng-controller="locations">
+      <li flow-prevent-drop flow-drop flow-drag-enter="class='alert-success'" flow-drag-leave="class=''" ng-class="class" ng-controller="location" flow-init="init(location.id, location.location); beforeUploading" ng-style="style" ng-repeat="location in locations" ng-init="$last && reloadLocations()" id="location-{{location.id}}" class="collapsible locations">
+        <button flow-prevent-drop flow-drop flow-drag-enter="class='alert-success'" flow-drag-leave="class=''" class="collapse"></button>
 
-  <span class="btn" flow-btn><?= $l->t('Select File'); ?></span>
-  <span class="btn" flow-btn flow-directory ng-show="$flow.supportDirectory"><?= $l->t('Select Folder'); ?></span>
+        <a href="#" class="icon-folder" ng-click="setLocation(location.id, $flow)">{{location.location}}</a>
+        <ul>
+    		  <li><a class="icon-add" href="#" flow-btn><?= $l->t('Upload a file'); ?></a></li>
+    		  <li><a class="icon-add" href="#" flow-btn flow-directory ng-show="$flow.supportDirectory"><?= $l->t('Upload a whole folder'); ?></a></li>
+        </ul>
+      </li>
 
-  <hr class="soften">
+      <li id="app-navigation-entry-utils-add">
+        <a href="#"><?= $l->t('New destination'); ?></a>
+        <div class="app-navigation-entry-utils">
+          <ul>
+            <li id="app-navigation-entry-utils-create" class="app-navigation-entry-utils-menu-button"><button class="icon-add"></button></li>
+          </ul>
+        </div>
+        <div class="app-navigation-entry-edit">
+          <form>
+            <input id="newLocationName" type="text" placeholder="<?= $l->t('Destination name'); ?>" ng-keydown="$event.keyCode === 13 && addNewLocation()">
+            <input type="submit" value="" class="icon-close">
+            <input ng-click="addNewLocation()" type="submit" value="" class="icon-checkmark">
+          </form>
+        </div>
+      </li>
+    </ul>
 
-  <div class="alert" flow-drop flow-drag-enter="class='alert-success'" flow-drag-leave="class=''"
-          ng-class="class"><?= $l->t('... or drag and drop your files here'); ?>
+    <input id="currentLocation" type="hidden" />
   </div>
 
-  <hr class="soften">
-
-  <h2><?= $l->t('Transfers'); ?></h2>
-  <p>
-    <a class="btn btn-small btn-success" ng-click="$flow.resume()"><?= $l->t('Upload'); ?></a>
-    <a class="btn btn-small btn-danger" ng-click="$flow.pause()"><?= $l->t('Pause'); ?></a>
-    <a class="btn btn-small btn-info" ng-click="$flow.cancel()"><?= $l->t('Cancel'); ?></a>
-    <span class="label label-info"><?= $l->t('Size'); ?>: {{$flow.getSize() | bytes}}</span>
-    <span class="label label-info" ng-if="$flow.isUploading()"><?= $l->t('Uploading'); ?>...</span>
-  </p>
-  <table class="table table-hover table-bordered table-striped" flow-transfers>
-    <thead>
-    <tr>
-      <th style="width:5%">#</th>
-      <th><?= $l->t('Name'); ?></th>
-      <th style="width:10%"><?= $l->t('Size'); ?></th>
-      <th style="width:20%"><?= $l->t('Progress'); ?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr ng-repeat="file in transfers">
-      <td>{{$index+1}}</td>
-      <td title="UID: {{file.uniqueIdentifier}}">{{file.relativePath}}</td>
-      <td title="Chunks: {{file.chunks.length}}"><span ng-if="file.isUploading()">{{file.size*file.progress() | bytes}}/</span>{{file.size | bytes}}</td>
-      <td>
-        <div class="btn-group" ng-if="!file.isComplete() || file.error()">
-          <progress max="1" value="{{file.progress()}}" title="{{file.progress()}}" ng-if="file.isUploading()"></progress>
-          <a class="btn btn-mini btn-warning" ng-click="file.pause()" ng-hide="file.paused">
-            <?= $l->t('Pause'); ?>
-          </a>
-          <a class="btn btn-mini btn-warning" ng-click="file.resume()" ng-show="file.paused">
-            <?= $l->t('Resume'); ?>
-          </a>
-          <a class="btn btn-mini btn-danger" ng-click="file.cancel()">
-            <?= $l->t('Cancel'); ?>
-          </a>
-          <a class="btn btn-mini btn-info" ng-click="file.retry()" ng-show="file.error">
-            <?= $l->t('Retry'); ?>
-          </a>
-        </div>
-	<span ng-if="file.isComplete() && !file.error()"><?= $l->t('Completed'); ?></span>
-      </td>
-    </tr>
-    </tbody>
-  </table>
-  <p><a href="../files?dir=%2Fflowupload"><?= $l->t('The files will be saved in your home directory.'); ?></a></p>
+  <div ng-controller="flow" flow-init="beforeUploading" id="app-content" flow-prevent-drop ng-style="style" style="padding: 2.5%; width:auto">
+    <h2 style="padding-bottom: 25px;"><?= $l->t('Transfers'); ?></h2>
+    <p style="padding-bottom: 5px;">
+      <a class="btn btn-small btn-success" ng-click="$flow.resume()"><?= $l->t('Upload'); ?></a>
+      <a class="btn btn-small btn-danger" ng-click="$flow.pause()"><?= $l->t('Pause'); ?></a>
+      <a class="btn btn-small btn-info" ng-click="$flow.cancel()"><?= $l->t('Cancel'); ?></a>
+      <span class="label label-info"><?= $l->t('Size'); ?>: {{$flow.getSize() | bytes}}</span>
+      <span class="label label-info" ng-if="$flow.isUploading()"><?= $l->t('Uploading'); ?>...</span>
+    </p>
+    <table class="table table-hover table-bordered table-striped" flow-transfers>
+      <thead>
+      <tr>
+        <th style="width:5%">#</th>
+        <th><?= $l->t('Name'); ?></th>
+        <th style="width:10%"><?= $l->t('Size'); ?></th>
+        <th style="width:20%"><?= $l->t('Progress'); ?></th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr ng-repeat="file in $flow.files">
+        <td>{{$index+1}}</td>
+        <td title="UID: {{file.uniqueIdentifier}}">{{file.relativePath}}</td>
+        <td title="Chunks: {{file.chunks.length}}"><span ng-if="file.isUploading()">{{file.size*file.progress() | bytes}}/</span>{{file.size | bytes}}</td>
+        <td>
+          <div class="btn-group" ng-if="!file.isComplete() || file.error()">
+            <progress max="1" value="{{file.progress()}}" title="{{file.progress()}}" ng-if="file.isUploading()"></progress>
+            <a class="btn btn-mini btn-warning" ng-click="file.pause()" ng-hide="file.paused">
+              <?= $l->t('Pause'); ?>
+            </a>
+            <a class="btn btn-mini btn-warning" ng-click="file.resume()" ng-show="file.paused">
+              <?= $l->t('Resume'); ?>
+            </a>
+            <a class="btn btn-mini btn-danger" ng-click="file.cancel()">
+              <?= $l->t('Cancel'); ?>
+            </a>
+            <a class="btn btn-mini btn-info" ng-click="file.retry()" ng-show="file.error">
+              <?= $l->t('Retry'); ?>
+            </a>
+          </div>
+  	      <span ng-if="file.isComplete() && !file.error()"><?= $l->t('Completed'); ?></span>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+    <p><?= $l->t('The files will be saved in your home directory.'); ?></p>
  </div>
diff --git a/templates/part.content.php b/templates/part.content.php
new file mode 100644
index 00000000..5239375f
--- /dev/null
+++ b/templates/part.content.php
@@ -0,0 +1,10 @@
+<script id="content-tpl" type="text/x-handlebars-template">
+    {{#if note}}
+        <div class="input"><textarea>{{ note.content }}</textarea></div>
+        <div class="save"><button><?php p($l->t('Save')); ?></button></div>
+    {{else}}
+        <div class="input"><textarea disabled></textarea></div>
+        <div class="save"><button disabled><?php p($l->t('Save')); ?></button></div>
+    {{/if}}
+</script>
+<div id="editor"></div>
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
new file mode 100644
index 00000000..99891a4b
--- /dev/null
+++ b/templates/part.navigation.php
@@ -0,0 +1,11 @@
+<li id="location-<?= $location['id']; ?>" class="collapsible">
+  <button class="collapse"></button>
+
+  <a href="#" class="icon-folder"><?= $location['location']; ?></a>
+  <ul>
+    <li><a class="icon-pause" href="#"><?= $l->t('Waiting'); ?> (<span class="upload-in-pause"><?= $location['nbrInPause']; ?></span>)</a></li>
+    <li><a class="icon-upload" href="#"><?= $l->t('Uploading'); ?> (<span class="upload-uploading"><?= $location['nbrUploading']; ?></span>)</a></li>
+    <li><a class="icon-checkmark" href="#"><?= $l->t('Completed'); ?> (<span class="upload-completed"><?= $location['nbrCompleted']; ?></span>)</a></li>
+    <li><a class="icon-close" href="#"><?= $l->t('Aborted'); ?> (<span class="upload-aborted"><?= $location['nbrAborted']; ?></span>)</a></li>
+  </ul>
+</li>