Initial commit (with upgrade to vs2012)