Merge branch 'cst-next' into nmp-cst-next

- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)

src/gui/scan_setup.cpp

@@ -2020,6 +2020,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
 		std::string text = "No transponders found for ";
 		text += name;
 		ShowHint(LOCALE_MESSAGEBOX_ERROR, text.c_str(), 450, 2);
+		delete selector;
 		return menu_return::RETURN_REPAINT;
 	}