WIP
Merge branch 'master' of https://github.com/omer-g/bike-me-phonegap