Fixes to Windows8/WindowsStore/WinRT templates.  Fix to work in VS2012 and VS2013.