Merge branch 'release/1.1.7' into develop

CHANGELOG.txt

@@ -1,6 +1,13 @@
 Stylet Changelog
 ================
 
+v1.1.7
+------
+
+ - Fix issue where OnInitialActivate may not be invoked if Screen was deactivated before being activated
+ - Action s:Action to be instantiated with zero parameters
+ - Make Stylet more modular by removing dependency on Application.Current from WindowManager, and View.ViewManager static property
+
 v1.1.6
 ------
 

NuGet/Stylet.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Stylet</id>
-    <version>1.1.6</version>
+    <version>1.1.7</version>
     <title>Stylet</title>
     <authors>Antony Male</authors>
     <owners>Antony Male</owners>

Stylet/Properties/AssemblyInfo.cs

@@ -35,5 +35,5 @@ using System.Windows.Markup;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.6.0")]
-[assembly: AssemblyFileVersion("1.1.6.0")]
+[assembly: AssemblyVersion("1.1.7.0")]
+[assembly: AssemblyFileVersion("1.1.7.0")]