add docType permissions
merge coflict
add check permission in conector and attachment
remove tmp files after upload to couchdb
keep trying to connect to redis
with default exponential retry delay
Merge pull request #19 from mycozycloud/development

Development
change authentication for encrypted keys
Add comments
remove useless parameter in initToken
Code cleaning: unify empty lines
remove description for home and proxy
update token when application is updated
Merge branch 'feature/applicationAuthentification' of git://github.com/poupotte/cozy-data-system
use env variable to give tokens instead of reading a file
Merge branch 'feature/permissionDocType' of git://github.com/poupotte/cozy-data-system

Conflicts:
	app/controllers/data_controller.coffee
	lib/token.coffee