merging gui-projects into master