test lightmap
Merge branch 'master' of https://github.com/Jeace/ADGLADIUM

Conflicts:
	Assets/scene.unity