modify js
Merge branch 'master' of https://github.com/jyt0532/CS598
Merge remote-tracking branch 'origin/master'
add popover on point
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/cs598.js
fix bugs