Removing dead code from Main.xaml.cs

Also adding files to the project
Merge branch 'master' into andrew_dev