Fix a bug with XAML namespaces
Merge branch 'develop_with_design_patterns' into develop