Add WindowsStore support
Merge in latest changes from craftworkgames