Removed merge marker(s) - Add filter folder(s) to Windows project

Organize and clean solution - re-build Store package(s) and add new test
certificate for Windows project.