增加功能
删除文件
Merge branch 'activeadmin' of github.com:MAD-Studio/BHIS into activeadmin

Conflicts:
	app/controllers/home_controller.rb