Voided test with specific directory
Merge branch 'VS10Upgrade'
Merge commit 'be42bb74d2300578135f5d0b2f30955e58c74abd'
VS2012 Upgrade
Added New Docs Folder
Fixing Conflict