small changes
Merge branch 'master' into christoffer
Merge branch 'master' into christoffer
database sync with GUI
conflict fix
Gui stuff