fixed bug 97 and 79
Temporarily deleted TestsWindowsPhone
Added new TestsWindowsPhone
Fixed new TestsWindowsPhone
fixed merge fail
Merge TFS Changeset 160