add docType permissions
merge coflict
add check permission in conector and attachment
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/permissionDocType' of git://github.com/poupotte/cozy-data-system

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