Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
enable webfinger
fix app name
revert app-name
increase timeouts, fix travis tests
add caldav and carddav .well-known shortcut
Merge pull request #24 from aenario/testfix

Test fix
change start script
remove console.error
Merge branch 'master' of github.com:frankrousseau/cozy-proxy

Conflicts:
	package.json
	proxy.coffee
reset routes every minutes, then every 10 minutes.
build proxy.js
merge conflict
Merge pull request #26 from poupotte/feature/updateRoutes

Feature/update routes
stop update routes after 15 occurences
Merge pull request #27 from poupotte/feature/updateRoutes

stop update routes after 15 occurences
configure DS for tests