Merge remote-tracking branch 'origin/master' into remove-normalization

# Conflicts:
#	test-suite/vocab.html

Author: gkellogg

CONTRIBUTING.md

@@ -0,0 +1,22 @@
+Contributions to this repository are intended to become part of Recommendation-track documents governed by the
+[W3C Patent Policy](http://www.w3.org/Consortium/Patent-Policy-20040205/) and
+[Document License](http://www.w3.org/Consortium/Legal/copyright-documents). To make substantive contributions to specifications, you must either participate
+in the relevant W3C Working Group or make a non-member patent licensing commitment.
+
+If you are not the sole contributor to a contribution (pull request), please identify all
+contributors in the pull request comment.
+
+To add a contributor (other than yourself, that's automatic), mark them one per line as follows:
+
+```
++@github_username
+```
+
+If you added a contributor by mistake, you can remove them in a comment with:
+
+```
+-@github_username
+```
+
+If you are making a pull request on behalf of someone else but you had no part in designing the
+feature, you can remove yourself with the above syntax.

LICENSE.md

@@ -0,0 +1,23 @@
+Software libraries that are included with different licenses keep the licenses that were assigned to them originally.
+
+MIT License
+
+Copyright (c) 2017 JSON-LD Public Repositories
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

contexts/.htaccess

@@ -1,7 +1,7 @@
 <FilesMatch "(event|person|place|recipe|\.jsonld)$">
    ForceType application/ld+json
    SetHandler default_handler
-   Header add Access-Control-Allow-Origin *
+   Header set Access-Control-Allow-Origin *
 </FilesMatch>
 
 Redirect 301 /contexts/schema.org.jsonld http://schema.org/

index.html

@@ -252,7 +252,7 @@ <h1 class="span12" style="text-align: center;">
         as of 16 January 2014. Participation is open
         to the public. There is a <a href="http://github.com/json-ld">JSON-LD
         Github repository</a>. If you need immediate help, we have a <a
-        href="http://webchat.freenode.net/?channels=#json-ld">#json-ld</a> IRC
+        href="https://webchat.freenode.net/?channels=#json-ld">#json-ld</a> IRC
         support channel on freenode.net. There is also a <a
         href="http://lists.w3.org/Archives/Public/public-linked-json/">JSON-LD
         mailing list</a>. All weekly meetings are open to the public, and are <a

learn.html

@@ -113,6 +113,7 @@ <h1>Presentations</h1>
           <li><a href="http://www.slideshare.net/gkellogg1/json-for-linked-data">JSON-LD: JSON for Linked Data</a> by Gregg Kellogg, Semantic Technology &amp; Business Conference (SemTechBiz SF 2012), San Francisco, CA, USA.</li>
           <li><a href="http://slidesha.re/jsonld4rest">JSON-LD for RESTful Services</a> by Markus Lanthaler, World Wide Web Conference (WWW2012), Lyon, France.</li>
           <li><a href="http://www.slideshare.net/gkellogg1/jsonld-and-mongodb">JSON-LD and MongoDB</a> by Gregg Kellogg, NoSQL Now! 2012, San Jose, CA, USA.</li>
+          <li><a href="http://www.slideshare.net/gkellogg1/jsonld-update">JSON-LD Update</a> by Gregg Kellogg, Web of Things F2F, February 2017, Santa Clara, CA, USA.</li>
         </ul>
         <h1>Blog Posts</h1>
         <ul>