Merge qt-gui 0.0.1 alpha with main