gui assets
Merge branch 'NewMaster' into GUI
Merge branch 'NewMaster' into GUI