inti
hh
hh
mysql
web
Merge remote-tracking branch 'origin/master' into dev-x

Conflicts:
	README.md
	shop/Conf/config.php
	shop/Modules/Admin/Conf/config.php
	shop/Modules/Index/Conf/config.php
	shop/Modules/Member/Conf/config.php