Made a ton of refactoring changes to the code, more to come.
Merge branch 'master' of https://github.com/purpleplatypus/FHAES

Conflicts:
	FHRecorder/src/main/java/org/fhaes/FHRecorder/EventPanel.java