Pushing up ListView code
Merge branch 'master' of https://github.com/heathj/Rideboard

Conflicts: