fix timeout
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/locationCanvas.js
Merge remote-tracking branch 'origin/master'
fix timeout