place units
Merge branch 'master' of github.com:mcfedr/hangout-risk
Merge branch 'master' of github.com:mcfedr/hangout-risk
labels
Merge branch 'master' of github.com:mcfedr/hangout-risk
Merge branch 'master' of github.com:mcfedr/hangout-risk

Conflicts:
	site/js/map.js
map handler