Merge pull request #17 from nixta/nixta-working

Refactor Citybikes sample and improve caching.
Merge branch 'master' into nixta-working

* master: