Started reworking panels
Merge branch 'develop' of github.com:luukholleman/ASRSJava into feature-simulationRefactor
further progress changing panels + EM
Merge branch 'feature-simulationRefactor' into develop