integrating the 3D prototype into our site
3D prototype integrated with site
Merge branch 'master' of https://github.com/dpilipenko/one-map

Conflicts:
	one-map/web-app/js/main.js
Merge branch 'master' of https://github.com/dpilipenko/one-map