fixes fsharp/FAKE#165 by including MSBuild 12.0 paths
Merge branch 'master' into develop

Conflicts:
	src/app/FAKE/app.config