no
Merge branch 'master' of https://github.com/vuthysin5284/mingalar

Conflicts:
	controllers/store/store.php
	customizes/user.php
	index.php
	js.php
	menus/menu.php
	object.php