Merge remote-tracking branch 'origin/master'

# Conflicts:
#	MyWeather.UWP/project.lock.json

MyWeather.Droid/MainActivity.cs

@@ -17,14 +17,15 @@ namespace MyWeather.Droid
 
 		protected override void OnCreate (Bundle bundle)
 		{
-			base.OnCreate (bundle);
+			
+		    ToolbarResource = Resource.Layout.toolbar;
+		    TabLayoutResource = Resource.Layout.tabs;
+		    base.OnCreate (bundle);
 
-            Forms.Init(this, bundle);
-            Xamarin.Insights.Initialize(Xamarin.Insights.DebugModeKey, this);
-
-            ToolbarResource = Resource.Layout.toolbar;
-            TabLayoutResource = Resource.Layout.tabs;
-            LoadApplication(new App());
+		    Forms.Init(this, bundle);
+		    Xamarin.Insights.Initialize(Xamarin.Insights.DebugModeKey, this);
+		
+		    LoadApplication(new App());
 		}
 	}
 }

MyWeather.UWP/MyWeather.UWP.csproj

@@ -86,7 +86,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->

README.md

@@ -3,6 +3,8 @@ MyWeather.Forms
 
 This is a small sample application showing how to query OpenWeatherMap.org to gather weather for a current location.
 
+Built with C# 6 features, you must be running VS 2015 or Xamarin Studio to compile. 
+
 Built with Xamarin.Forms with support for:
 * iOS
 * Android
@@ -10,4 +12,4 @@ Built with Xamarin.Forms with support for:
 
 Grabs current weather and 5 day forecast.
 
-![](Images/promo.png)
+![](Images/promo.png)