Revert "change gps wait to modal"

This reverts commit b04ed72bc51a79b6c879b307e0c79b280a107fbe.

Conflicts:
	public/js/map.js
fix variable declation