Rakuten

doing
Merge branch 'master' of https://github.com/AaronKim-CN/haidijia

Conflicts:
	app/Controller/SearchesController.php
Merge branch 'master' of https://github.com/AaronKim-CN/haidijia