PackageInfo moved inside DictionaryUtil
Merge branch 'master' into ice-cream-sandwich
refactoring
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into master-catalogs
more issues
formatting
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
All Catalogs on result
Merge branch 'master-catalogs' of github.com:geometer/FBReaderJ into master-catalogs

Conflicts:
	src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java
All Catalogs on result + fix
"Catalogs manager" tree item
Fix result setting
Merge branch 'master' into master-catalogs
"all catalogs" => "manage catalogs"
rollback for accidental commit
synchronization with new catalogs code (resources + constant)
Merge branch 'master' into master-catalogs

Conflicts:
	assets/resources/application/ru.xml
	src/org/geometerplus/android/fbreader/network/action/ActionCode.java
Merge branch 'ice-cream-sandwich' into ics-catalogs
missing icon