Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
reset routes every minutes, then every 10 minutes.
build proxy.js
merge conflict
Merge pull request #26 from poupotte/feature/updateRoutes

Feature/update routes