redirect to edit_shop_url after updating
redirect to '/error' if token is invalid
Merge branch 'style'
shop状態変更画面
Merge branch 'yulei2013-master'

Conflicts:
	app/views/home/index.html.erb
remove link to menu

menu dosen't exist now