procedural tilemap template finished
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/-tk2d.asset
	Assets/12px_SpriteCollection Data/12px_SpriteCollection.prefab
	Assets/Scenes/12px_testEnvironment.unity