merge conflict
merge conflict

ButchersBoy/MaterialDesignInXamlToolkit,DingpingZhang/MaterialDesignInXamlToolkit,ButchersBoy/MaterialDesignInXamlToolkit,tipunch74/MaterialDesignInXamlToolkit,tipunch74/MaterialDesignInXamlToolkit,ButchersBoy/MaterialDesignInXamlToolkit,tipunch74/MaterialDesignInXamlToolkit