Strange Errors and Created Navigation.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.4.html
	locations.js