add style annotatin
Merge branch 'style'
shop状態変更画面
Merge branch 'yulei2013-master'

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

menu dosen't exist now
remove h1 from shops/edit
remove empty line and fix indent in shops/edit