fix commit
Merge remote-tracking branch 'origin/master' into tmp

Conflicts:
	src/pl/pwr/sztuczneoko/core/EventCollector.java
jre1.7