Updating nuspec files and build
Correcting unit test after update to ContentType ctor
Merge branch '6.0.7' into 6.1.2

Conflicts:
	build/Build.proj
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
Updating nuspec files which is a bit different for 6.1.x then 6.0.x
Merge branch '6.1.2' of https://github.com/umbraco/Umbraco-CMS into 6.1.2