formatting
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