Dll for GUI
after reset
Merge branch 'logic'
merge