陶器対応
Merge branch 'master' of https://github.com/katsuhide/kakehashi

Conflicts:
	app/assets/javascripts/kakehashi/apps/templates/trend.jst.eco
	app/assets/javascripts/kakehashi/apps/templates/trend_bubble.jst.eco