Folders structure and Unity-generated automatic changes
Further unity-generated meta files
unity made this
commit to merge
Merge branch 'gustavo' into ‘master’

Conflicts:
	Assets/Audio.meta
	Assets/Materials.meta
	Assets/Models.meta
	Assets/Prefabs.meta
	Assets/Textures.meta
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	ProceduralCityUnity-csharp.sln
	ProceduralCityUnity.sln