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