Merge branch 'master' into file-upload-v2

Conflicts:
	src/css/main.css
	src/js/controllers/main.js

Author: durasj

API.md

@@ -1,4 +1,4 @@
-## angular-filemanager API v2 docs
+## angular-filemanager API docs [multiple file support]
 
 #### Listing (URL: fileManagerConfig.listUrl, Method: POST)
 

README.md

@@ -4,22 +4,19 @@ A very smart filemanager to manage your files in the browser developed in Angula
 
 [![Build Status](https://travis-ci.org/joni2back/angular-filemanager.svg?branch=master)](https://travis-ci.org/joni2back/angular-filemanager)
 
-#### I'm working on multiple file support / drag and drop features. API should be changed. For more information / contribute, see "[click-changes](https://github.com/joni2back/angular-filemanager/tree/click-changes)" branch.
-
 ### Support
 This project is under free license. If you want to support the angular-filemanager development or just thank it's main maintainer by paying a beer, you can make a donation by clicking the following button  [![Donate](https://www.paypal.com/en_GB/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XRB7EW72PS982) 
 
 
 #### [Try the DEMO](http://angular-filemanager.zendelsolutions.com/)
 ---------
-![](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot1.png)
-![](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot2.png)
-![](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot3.png)
+![](https://raw.githubusercontent.com/joni2back/angular-filemanager/click-changes/screenshot.gif)
 
 ### Features
-  - Multilanguage (English / Spanish / Portuguese / French / German)
+  - Multilanguage (English / 简体中文 / Spanish / Portuguese / French / German / Slovak / Hebrew)
   - Multiple templates (List / Icons)
   - Multiple file upload
+  - Multiple file support
   - Search files
   - Directory tree navigation
   - Copy, Move, Rename (Interactive UX)
@@ -28,8 +25,6 @@ This project is under free license. If you want to support the angular-filemanag
   - Mobile support
 
 ### TODO
-  - Improve the docs
-  - Multiple file selector
   - Drag and drop
   - Dropbox and Google Drive compatibility
   - Extend backend bridges (PHP, Java, Python, Node, .Net)
@@ -101,7 +96,7 @@ This project is under free license. If you want to support the angular-filemanag
     config.set({
       appName: 'my angular-filemanager',
       allowedActions: angular.extend(defaults.allowedActions, {
-        remove: true
+        remove: false
       })
     });
   }]);
@@ -119,3 +114,5 @@ For transparency into our release cycle and in striving to maintain backward com
 
 ### Copyright and license
 Code and documentation released under [the MIT license](https://github.com/joni2back/angular-filemanager/blob/master/LICENSE).
+
+

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-filemanager",
-  "version": "1.4.8",
+  "version": "1.5.0",
   "homepage": "https://github.com/joni2back/angular-filemanager",
   "authors": [
     "Jonas Sciangula Street <joni2back@gmail.com>"