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