記事編集画面を修正
Merge branch 'develop' of github.com:rawhide/simpleblog into feature/admin_edit

Conflicts:
	app/views/admin/articles/_form.html.erb
Merge branch 'feature/admin_edit' into develop