Fix error from conflict

Somehow from my merge of 595-21 and master, there was a conflict.  After
I resolved my changes that were coming into master, I ended up with
these 2 files in the solution that had broken the navigation from
MainPage to AddNewItemPage.  After deleting these files, all previous
behavior seems to be working.