Merge branch 'master' of github.com:fsprojects/FSharp.ProjectScaffold

Conflicts:
	.gitignore
	.nuget/NuGet.exe
	README.md
	RELEASE_NOTES.md
	build.cmd
	build.fsx
	build.sh
	docs/content/index.fsx
	docs/tools/generate.fsx
	docs/tools/templates/template.cshtml