Fix folder select clauses to always include root folder. Refactor selection clauses in general.
Fix tabbing in previous commit.
Merge pull request #205 from ojiikun/master

Android: Ensure All Stories / Root Folder Always Appears
Falling back to a POST request on river queries that have too many feeds.
Merge branch 'master' into circular

* master:
  Falling back to a POST request on river queries that have too many feeds.
  Fix tabbing in previous commit.
  Fix folder select clauses to always include root folder. Refactor selection clauses in general.