MouseEvents, ActionEvents, etc.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/MainWindow.java