Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/global.js
	app/views/dashboard/excel.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/students/show.html.erb