Merge pull request #1499 from buma/master_bikesharequickfix

Fix for Bikeshare module. Remove JSONP; change mode to BIKE_RENT
Merge remote-tracking branch 'upstream/master' into VCub