Catalog import
Merge branch 'dev' of git@github.com:icehockeystar/militaryshop.git into dev

Conflicts:
	src/main/java/com/euroit/militaryshop/catalog/impl/CatalogImporterImpl.java