update changelog for release

changelog.md

@@ -7,4 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.2.0]
 
 * Changelog added.
+* Added Scrutinizer support
 * Add `ContentFilter.cache_lifetime` config to set the cache lifetime.
+* Update alternate xml link tag to be W3 compliant 
+* Added CWP keyword

composer.json

@@ -14,5 +14,12 @@
 	{
 		"silverstripe/framework": ">=3.1",
 		"silverstripe/cms": ">=3.1"
+	},
+	"extra": 
+	{
+		"branch-alias": 
+		{
+			"dev-master": "1.2.x-dev"
+		}
 	}
 }