Merge pull request #55 from jsilvestre/master

Minor fixes
upped cozy-clearance & improve contact autocomplete
brunched & built
fix dependency version format
Merge pull request #57 from aenario/master

upped cozy-clearance & improve contact autocomplete
refactor error displaying
refactoring folder upload step 1

- extract folder modal in a class
Modal Refactoring
- factor out Modal error usages into Modal.error
- new FolderModal every time
- extends events
extract upload moda into its own class
fix modal afterRender
folder view refactoring
bugfix modals & spinner
user ModalUpload to upload files in a folder
brunched
Merge branch 'master' of github.com:jsilvestre/cozy-files

Conflicts:
	client/app/views/folder.coffee
	client/app/views/styles/_main.styl
	client/public/javascripts/app.js.map
build is missing...
Merge branch 'master' of github.com:mycozycloud/cozy-files

Conflicts:
	build/client/public/javascripts/app.js.map
	build/client/public/javascripts/vendor.js.map
	build/client/public/stylesheets/app.css.map
	client/public/javascripts/app.js.map
	client/public/javascripts/vendor.js.map
	client/public/stylesheets/app.css.map
	package.json
Merge pull request #60 from frankrousseau/master

Refactor Folder view
Merge remote-tracking branch 'cozy/master' into aenario/master

Conflicts:
	client/app/initialize.coffee
	client/app/views/files.coffee
	client/app/views/folder.coffee
	client/app/views/styles/_main.styl
	client/public/javascripts/app.js
	client/public/javascripts/app.js.map
	client/public/javascripts/vendor.js
	client/public/javascripts/vendor.js.map
	client/public/stylesheets/app.css
	client/public/stylesheets/app.css.map
missed conflict
fix spinner