location query fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	srv.js
Merge branch 'master' of https://github.com/ashkanpower/NaviWeb