Change for test
Merge branch 'activeadmin' of github.com:MAD-Studio/BHIS into activeadmin

Conflicts:
	app/admin/user_permission.rb
	db/schema.rb
更改小细节