refactoring
Merge branch 'master' into nook
FolderListDialogActivity declaration
Merge branch 'master' into nook
folder list layout
Merge branch 'master' into nook
naming convention
Merge branch 'master' into nook
folder list dialog layout
Merge branch 'master' into nook