Displaying accounts, adding accounts, minor StorageProvider additions
Added .DS_Store to .gitignore
Merge with master
"fix" semicolons
replace one dubious whitespace
ignore local settings / files / users
add aws-sdk to required node packages
Testfunctions for Amazon S3.
Runs standalone, but requires set environment variables:
 export AWS_ACCESS_KEY_ID='AKID'
 export AWS_SECRET_ACCESS_KEY='SECRET'
some more testfunctions
implemented Amazon Provider (create, read, delete)
note for settings:
  {"type":"amazon", "credentials":[
    {"key":"val1", "secret":"val2"}
  ]}
fixed callbacks, S3 instantiation, settings syntax

{"type":"amazon", "key":"val1", "secret":"val2”}
Merge branch 'master' of https://github.com/cloudraid/cloudraid

Conflicts:
	.gitignore
	lib/StorageManager.js
	lib/StorageManagerMemory.js
	lib/StorageProvider.js
	lib/StorageProviderAmazon.js
	lib/StorageProviderBox.js
	lib/StorageProviderDropbox.js
	routes/files.js
Merge interim with master
adding dropbox storage provider implementation
bugfix
Added more file metadata
Fixed Box logging
Minor fix
Add missing implementation for de/encrypting the settings of users
Allow empty data in calculateHash
Box: Allow overwriting files when uploading