Some changes,
Merge branch 'master' of https://github.com/AaronKim-CN/haidijia

Conflicts:
	app/Config/const.php