Merge branch 'release/0.1.5' into develop
updated API documentation
Merge branch 'develop' of git://github.com/all-ride/ride-app-orm into develop
implemented entry proxy into ride
fixed merge conflict
bumped version
Merge branch 'release/0.2.0'