track rides
Merge branch 'master' of https://github.com/Cyclee/cyclee_central

Conflicts:
	cycleecarto/cyclee_client/static/js/ride.js