Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	res/drawable/ic_menu_add.png
	res/drawable/ic_menu_filter.png
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
max font size => 144 (was 72)
fixed ColorDict3 support
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into master-catalogs
Merge branch 'master-catalogs' into ics-catalogs
Merge branch 'ice-cream-sandwich' into ics-catalogs

Conflicts:
	AndroidManifest.xml
	res/drawable/ic_menu_filter.png
Merge branch 'ics-catalogs' into ics-catalogs-reorder