pop up

pop up dialog finctionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	student/stats.html