加入文章浏览页
Merge branch 'activeadmin' of github.com:MAD-Studio/BHIS into activeadmin

Conflicts:
	config/routes.rb