code cleanup
Merge branch 'master-catalogs' into ics-catalogs
new catalogs list address
Merge branch 'master' into master-catalogs
Merge branch 'master-catalogs' into ics-catalogs
added Armenian localization
Merge branch 'master' into master-catalogs
Merge branch 'master-catalogs' into ics-catalogs
fixed possible NPE
Merge branch 'master-catalogs' into ics-catalogs
formatting
Merge branch 'master-catalogs' into ics-catalogs