Update 10
Merge branch 'master' of https://github.com/RU-Craft/bcms

Conflicts:
	root/shop-services.php