fixed shit
Merge branch 'jeroen' of https://github.com/Kurocon/IntegrationProject into jeroen
 more fixes to guis
Changes to the wireshark parsing plugin
Merge branch 'jeroen'