Convert to VS2013
Revert "Convert to VS2013"

This reverts commit df389f9df4027e255ba1659340ff0b493f57af0d.
Merge remote-tracking branch 'origin/master'