B13

v-2.2
---
1. V:keywords#_form
	    => "Category" ==> Show genre name, too
Merge branch 'B13_restore-pre-NR4-status'

Conflicts:
	app/controllers/articles_controller.rb