Lazy strategy, fixed overlapping, cleaning
Merge branch 'master' of https://github.com/stnatic/tcs-organizer

Conflicts:
	src/main/java/views/gui/EventManager.java