Pulls dev into master to close documentation of gui code