asd
asd
asd
asd
Merge branch 'master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp
	The Seekers Way 0.2/EntityManager.h
	The Seekers Way 0.2/Main.cpp
fix