Pulls dev into master

Pulls the implementation of basic gui into the master branch
Also pulls memory leak optimizations into master