Update sample-eng.html

Change location path
Update sample-fra.html

Change location path
Merge branch 'master' into locationpath

Conflicts:
	demos/linkmap/sample-eng.html
	demos/linkmap/sample-fra.html