alert loading- by jarrick
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/directives/compare.js
button禁用时鼠标为默认- by jarrick