meet2
Merge branch 'master' of https://github.com/sumarokov/swim

Conflicts:
	sites/all/modules/swim_category/includes/block.php
	sites/all/modules/swim_import/include/Parser/Parser.php
	sites/all/modules/swim_import/swim_import.module
	sites/all/modules/swim_product/swim_product_options/swim_product_options.install