Merge branch 'master' into bugs
revert scrolling behavior until we know how it should work
don't show no results when loading more
Merge pull request #211 from balanced/bugs

Bugs III