update
Merge remote-tracking branch 'origin/master'

Conflicts:
	angular/master/directive/alert/alert.js
	angular/master/directive/pagination/index.html