Minor commit for merge prep
Merge branch 'master' of https://github.com/kiwimatto/2dpolim-analysis
Lots of changes. First alpha of gui