Merge pull request #11 from darrincedwards/event_analysis_interface

Address interface issues in Event Analysis window
Merge remote-tracking branch 'origin/master'