update
Merge branch 'master' of github.com:ryoshirakawa/playcast into design

Conflicts:
	app/views/plans/index.html.erb
update
update
Merge branch 'design'
デザインマージ調整