Added NUnit Visual Studio 2013 Adaptor Package
Fixed Merge Errors