fixed locations with no bounds
stuff
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	public/css/app.css