Develop

Pull latest develop changes into GUIRedesign.