synchronization with new catalogs code (resources + constant)
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
CatalogMananagerActivity declaration
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
layouts for layout manager
'ant clean' does not remove obj directory ('ant distclean' does)
simplified building procedure: icon files are in res/drawable, not in icons catalog
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	res/drawable/ic_menu_add.png
	res/drawable/ic_menu_filter.png
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics

Conflicts:
	res/drawable/ic_menu_add.png
	res/drawable/ic_menu_filter.png
Merge branch 'ice-cream-sandwich' into beta-ics
version number => 1.9
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml