Triangulation start
Merge branch 'master' into gustavo

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
	ProceduralCityUnity-csharp.sln
	ProceduralCityUnity.sln
Building floors unbinding and format variation
Triangulation attempt
Merge branch 'gustavo'

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	ProceduralCityUnity-csharp.sln
	ProceduralCityUnity.sln