refactoring
Merge branch 'master' into ice-cream-sandwich
FolderListDialogActivity declaration
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
folder list layout
Merge branch 'master' into ice-cream-sandwich
naming convention
Merge branch 'master' into ice-cream-sandwich
folder list dialog layout
Merge branch 'master' into ice-cream-sandwich