Merge branch 'master' into add-NotifyIcon

HandyControlDemo/Data/MessageToken.tt

@@ -21,7 +21,7 @@ var controlList = new List<string>
 	"WindowDemoCtl",
 	"ScrollViewerDemoCtl",
 	"PreviewSliderDemoCtl",
-	"CircleProgressBarDemoCtl",
+	"ProgressBarDemoCtl",
 	"TextBoxDemoCtl",
 	"ComboBoxDemoCtl",
 	"PasswordBoxDemoCtl",
@@ -46,21 +46,24 @@ var controlList = new List<string>
 	"ChatBubbleDemoCtl",
 	"GotoTopDemoCtl",
 	"NotifyIconDemoCtl"
+	"BadgeDemoCtl",
+	"GravatarDemoCtl",
+	"DialogDemoCtl"
 };
 var styleList = new List<string>
 {
 	"ButtonDemoCtl",
 	"ToggleButtonDemoCtl",
 	"ExpanderDemoCtl",
-	"ProgressBarDemoCtl",
+	"NativeProgressBarDemoCtl",
 	"TabControlDemoCtl",
 	"CalendarDemoCtl",
-	"NaiveDatePickerDemoCtl",
-	"NaiveTextBoxDemoCtl",
+	"NativeDatePickerDemoCtl",
+	"NativeTextBoxDemoCtl",
 	"TextBlockDemoCtl",
-	"NaiveComboBoxDemoCtl",
-	"NaivePasswordBoxDemoCtl",
-	"NaiveTabControlDemoCtl",
+	"NativeComboBoxDemoCtl",
+	"NativePasswordBoxDemoCtl",
+	"NativeTabControlDemoCtl",
 	"DataGridDemoCtl",
 	"CheckBoxDemoCtl",
 	"ListBoxDemoCtl",
@@ -68,7 +71,7 @@ var styleList = new List<string>
 	"TreeViewDemoCtl",
 	"BorderDemoCtl",
 	"RadioButtonDemoCtl",
-	"NaiveScrollViewerDemoCtl",
+	"NativeScrollViewerDemoCtl",
 	"BrushDemoCtl",
 	"SliderDemoCtl",
 	"GroupBoxDemoCtl",