- add instanceof entity/player check
Merge branch 'master' of
https://github.com/tudresden/sporteventanalyser.git

Conflicts:
	Statistics/src/de/core/EventDecoder.java
Merge branch 'master' of
https://github.com/tudresden/sporteventanalyser.git

Conflicts:
	Statistics/src/de/core/EventDecoder.java
	Statistics/src/de/core/Main.java
	Statistics/src/de/esper/CEPListener.java