Added assembly attributes for wpf imports.
Merge branch 'master' into develop