Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Dungeon Art Pack/Images/Materials/brick.mat
	Assets/PixelTexturePack/Textures/Floors/Materials/MarbleFloor.mat
	Assets/Prefabs/BrickWall.prefab
	Assets/Scenes/testScene.unity
	Assets/Scripts/InitGame.cs
	ProjectSettings/TagManager.asset