Added pull-to-refresh support and infinite scrolling - revised again
Merge branch 'pull-to-refresh-infinite-scroll'