test

test->tran_name
Merge branch 'master' of https://github.com/AaronKim-CN/haidijia

Conflicts:
	app/Controller/Component/RakutenComponent.php
	app/Test/Case/View/search.ctp
	app/View/Searches/main.ctp