Merge odahan's changes#3

Open

rhessinger wants to merge 2 commits intorhessinger:masterfrom

Commits on May 30, 2017

First clean up for next operations (wpf temes removal...)
odahan
committed
rename Window1 in MainWindow, and other clean-up actions to prepare for Windows Store conversion
odahan
committed