Update Format
Merge branch 'master' of https://github.com/eliu03/WelHair

Conflicts:
	src/www/backend/apps/modules/goods/controllers/IndexController.php