fix js error
implement favorite
Merge branch 'master' of https://github.com/tsuwatch/ma9

Conflicts:
	edison/app/views/item.blade.php
	edison/app/views/new.blade.php