update
Merge branch 'master' of https://github.com/fancystudio/vlasy

Conflicts:
	config/xml/blog-sk.xml
	config/xml/default_country_modules_list.xml
	config/xml/must_have_modules_list.xml
	modules/bankwire/config_sk.xml
	modules/blockbanner/config_sk.xml
	modules/blockbestsellers/config_sk.xml
	modules/blockcart/config_sk.xml
	modules/blockcategories/config_sk.xml
	modules/blockcmsinfo/config_sk.xml
	modules/blockcontactinfos/config_sk.xml
	modules/blockcurrencies/config_sk.xml
	modules/blockfacebook/config_sk.xml
	modules/blocklanguages/config_sk.xml
	modules/blocklayered/config_sk.xml
	modules/blockmanufacturer/config_sk.xml
	modules/blockmyaccount/config_sk.xml
	modules/blockmyaccountfooter/config_sk.xml
	modules/blocknewproducts/config_sk.xml
	modules/blocknewsletter/config_sk.xml
	modules/blockpaymentlogo/config_sk.xml
	modules/blocksearch/config_sk.xml
	modules/blocksocial/config_sk.xml
	modules/blockspecials/config_sk.xml
	modules/blockstore/config_sk.xml
	modules/blocksupplier/config_sk.xml
	modules/blocktags/config_sk.xml
	modules/blocktopmenu/config_sk.xml
	modules/blockuserinfo/config_sk.xml
	modules/blockviewed/config_sk.xml
	modules/blockwishlist/config_sk.xml
	modules/cheque/config_sk.xml
	modules/dashgoals/config_sk.xml
	modules/dashproducts/config_sk.xml
	modules/gamification/config_sk.xml
	modules/gamification/data/data_SK_EUR_SK.json
	modules/graphnvd3/config_sk.xml
	modules/gridhtml/config_sk.xml
	modules/homefeatured/config_sk.xml
	modules/homeslider/config_sk.xml
	modules/pagesnotfound/config_sk.xml
	modules/productcomments/config_sk.xml
	modules/productpaymentlogos/config_sk.xml
	modules/sekeywords/config_sk.xml
	modules/socialsharing/config_sk.xml
	modules/statsbestcategories/config_sk.xml
	modules/statsbestcustomers/config_sk.xml
	modules/statsbestproducts/config_sk.xml
	modules/statsbestvouchers/config_sk.xml
	modules/statscatalog/config_sk.xml
	modules/statsequipment/config_sk.xml
	modules/statsforecast/config_sk.xml
	modules/statslive/config_sk.xml
	modules/statssales/config_sk.xml
	modules/statssearch/config_sk.xml
	modules/statsvisits/config_sk.xml
	modules/themeconfigurator/config_sk.xml