Upgraded solution to VS2013
Fixed resharper issues