merge
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop

Conflicts:
	src/EntityManager.cpp
	src/GameManager.cpp
Possibility to see if an animation of a power is playing
Disable movements during the sneeze
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop

Conflicts:
	src/EntityManager.cpp
	src/EntityManager.h
	src/GameManager.cpp
Indention correction
Merge branch 'develop' of https://github.com/Symptogen/Symptogen into develop

Conflicts:
	src/GameManager.cpp