Webshop fixes.
Merge branch 'master' of https://github.com/muskovicsnet/swx

Conflicts:
	vendor/engines/webshop/app/controllers/webshop/application_controller.rb
	vendor/engines/webshop/app/models/webshop/product.rb