更改文件
Merge branch 'activeadmin' of github.com:MAD-Studio/BHIS into activeadmin

Conflicts:
	app/admin/user.rb
消除冲突