update Router and nav item
Merge branch 'master' of https://github.com/LSERRE/Dataviz-Education

Conflicts:
	index.html
	js/views/standardView.js
Merge branch 'master' of https://github.com/LSERRE/Dataviz-Education