認証待ちをやっぱりUserモデルに戻します…あとバグ直し
Merge branch 'master' of https://github.com/Naba16/design

Conflicts:
	app/views/sidebars/_admin.html.erb