Minor tweaks for templates
Minor changes for design time
Fixing design time problem
ViewModel scoping
Fixing problem with design time
New Message Box and other stuff
Merge from Ian