fix count functions
rename distance.pig to distance.ride
Merge branch 'feature-portal' into development