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

Conflicts:
	app/admin/banner.rb