Merge branch 'master' of https://github.com/ArcGIS/arcgis-runtime-sam…

…ples-macos into v.next

# Conflicts:
#	LICENSE
#	README.md

Contributing.md

@@ -0,0 +1 @@
+Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing).

LICENSE

@@ -1,4 +1,4 @@
-   Apache License - 2.0
+  Apache License - 2.0
 
 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 

README.md

@@ -1,22 +1,33 @@
 # arcgis-runtime-samples-macos
-This repository contains sample code demonstrating the capabilities of the ArcGIS Runtime SDK for macOS. The project can be opened in Xcode and run. The samples are listed in one of the following categories; Maps, 3D, Layers, Display Information, Edit Data, Features, Route & Navigation, and Search.
+This is a set of samples for demonstrating the capabilities of the [ArcGIS Runtime SDK for macOS](http://developers.arcgis.com/macOS/).
+The samples use ArcGIS Online basemaps and services.  Learn more [here](http://www.arcgis.com/about/).
+
+## Features
+* Maps - Open, create, inteact with and save maps
+* Layers - Layer types offered by the SDK
+* Features - Workign with Feature layers
+* Edit Data - Adding, deleting and editing features
+* Display Information - Displaying graphics, popups and callouts
+* Search - Finding an address
+* Geometry - Displaying geometries
+* Route & Navigation - Find a route around barriers
+* 3D - Display scenes, 3D symbols, and scene layers
 
-The ```master``` branch of this repository contains sample code demonstrating the capabilities of [ArcGIS Runtime SDK for macOS](http://developers.arcgis.com/macOS/). The ```v.next``` branch contains samples for the next release of this SDK.
+## Instructions
+
+1. Fork and then clone the repo. Don't know how? [Get started here.](http://htmlpreview.github.com/?https://github.com/Esri/esri.github.com/blob/master/help/esri-getting-to-know-github.html)
+2. Build and run the project to create a single app containing all of the samples.
 
 ## Requirements
-* [ArcGIS Runtime SDK for macOS](http://developers.arcgis.com/macOS/) (Requires an ArcGIS for Developers account which you can obtain for free.)
+[ArcGIS Runtime SDK for macOS](http://developers.arcgis.com/macOS/) (Requires ArcGIS for Developers account; free to sign up)
+
+For Swift : 
 * XCode 8.0 (or higher)
 * macOS SDK 10.12 (or higher)
 
-## Instructions
-
-1. Get the code in this repository. Don't know how? [Get started here.](http://htmlpreview.github.com/?https://github.com/Esri/esri.github.com/blob/master/help/esri-getting-to-know-github.html)
-2. Double click the arcgis-macos-sdk-samples.xcodeproj file to open the samples project in Xcode.
-2. Build and hit Run to create a single app containing all of the samples.
-
-##Additional Resources
+## Additional Resources
 
-* New to the API? Explore the documentation : [Guide](http://developers.arcgis.com/macos/latest/swift/guide/guide.htm) | [API Reference](http://developers.arcgis.com/macos/latest/api-reference/index.htm)
+* New to the API? Explore the documentation : [Guide](https://developers.arcgis.com/macos) | [API Reference](https://developers.arcgis.com/macos/latest/api-reference/)
 * Got a question? Ask the community on our [forum](http://geonet.esri.com/community/developers/native-app-developers/arcgis-runtime-sdk-for-os-x)
 
 ## Issues
@@ -27,5 +38,22 @@ Find a bug or want to request a new feature?  Please let us know by submitting a
 
 Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing).
 
-[](Esri Tags: ArcGIS Runtime macOS SDK Samples)
-[](Esri Language: Objective-C, Swift)
+## Licensing
+Copyright 2016 Esri
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+A copy of the license is available in the repository's [license.txt]( https://github.com/Esri/arcgis-runtime-samples-macos/blob/master/license.txt) file.
+
+[](Esri Tags: ArcGIS Runtime SDK macOS)
+[](Esri Language: SWIFT)