upgraded the project as VS2013 insisted.

Hopefully it doesn't fuck anything up
updated changes with stuff done since v3.2.1