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