Update shop
Merge branch 'shop_dev' of https://github.com/Drunyacoder/AtomXCMS-2 into shop_dev

Conflicts:
	modules/shop/index.php