Стили
Merge branch 'master' of https://github.com/Hanyken/AdroidShopClient

Conflicts:
	workspace/ShopClient/src/stx/shopclient/entity/CatalogSettings.java
Merge branch 'master' of https://github.com/Hanyken/AdroidShopClient

Conflicts:
	workspace/ShopClient/src/stx/shopclient/entity/CatalogSettings.java