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

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