install osm script
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy

Conflicts:
	scripts/setup-production/setup-2.sh
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy

Conflicts:
	scripts/deploy.sh