minimap ändringar
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
lol
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/STATISTICSlastgame.txt
	GameClient/UnitEntity.cpp
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
lol
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
hej
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt