GUI bugfix
Merge branch 'develop' of https://github.com/nversluis/TowerDefense into develop

Conflicts:
	Assets/Sprites/GUI/Items/Boots/boots1.png.meta
	Assets/Sprites/GUI/Items/Boots/boots2.png.meta
	Assets/Sprites/GUI/Items/Boots/boots3.png.meta
	Assets/Sprites/GUI/Items/Boots/boots4.png.meta
	Assets/Sprites/GUI/Items/Pixels.meta
	Assets/Sprites/GUI/Items/Pixels/Armor.meta
	Assets/Sprites/GUI/Items/Pixels/Boots.meta
	Assets/Sprites/GUI/Items/Pixels/Staff.meta
	Assets/Sprites/GUI/Items/Pixels/Sword.meta
	Assets/Sprites/GUI/Items/Shield.meta
	Assets/Sprites/GUI/Items/Shield/shield1.png.meta
	Assets/Sprites/GUI/Items/Shield/shield2.png.meta
	Assets/Sprites/GUI/Items/Shield/shield3.png.meta
	Assets/Sprites/GUI/Items/Shield/shield4.png.meta
	Assets/Sprites/GUI/Items/Staff/staff1.png.meta
	Assets/Sprites/GUI/Items/Staff/staff2.png.meta
	Assets/Sprites/GUI/Items/Staff/staff3.png.meta
	Assets/Sprites/GUI/Items/Staff/staff4.png.meta
	Assets/Sprites/GUI/Items/Sword/sword1.png.meta
	Assets/Sprites/GUI/Items/Sword/sword2.png.meta
	Assets/Sprites/GUI/Items/Sword/sword3.png.meta
	Assets/Sprites/GUI/Items/Sword/sword4.png.meta
	Assets/Sprites/GUI/Skills/AOE.png.meta
	Assets/Sprites/GUI/Skills/KABOOOM.png.meta
	Assets/Sprites/GUI/Skills/RegularMagicAttack.png.meta
	Assets/Sprites/GUI/Skills/Stun.png.meta
	Assets/Sprites/GUI/Stat Icons/boots.png.meta
	Assets/Sprites/GUI/Stat Icons/shield.png.meta
	Assets/Sprites/GUI/Stat Icons/staff.png.meta
	Assets/Sprites/GUI/Stat Icons/sword.png.meta
	Assets/Sprites/GUI/Towers/BarricadeFloor.png.meta
	Assets/Sprites/GUI/Towers/DOTTrapFloor.png.meta
	Assets/Sprites/GUI/Towers/FireTrapFloor.png.meta
	Assets/Sprites/GUI/Towers/MagicWallTrapFloor.png.meta
	Assets/Sprites/GUI/Towers/SlowTrapFloor.png.meta
	Assets/Sprites/GUI/Towers/SpearsFloor.png.meta
	Assets/Sprites/GUI/Towers/SpearsWall.png.meta