Language and setting
png
Merge branch 'master' of https://github.com/azekool/development.git

Conflicts:
	startproject/upload/admin/controller/common/menu.php
	startproject/upload/admin/view/template/common/menu.tpl
	startproject/upload/shop/view/theme/default/template/card/card_list.tpl