Signed the CLA and merge conflicts resolved

Author: developer-rakeshpaul

site/community/Community-Events.md

@@ -46,6 +46,17 @@ Uri Goldshtein works at Meteor Development group at the Apollo team and is the c
 
 As our applications grow larger and our models and views become more and more complex, data fetching can become a real problem. This talk explores REST APIs pain points and how GraphQL can solve data fetching problems easily, using a declarative and hierarchical query language.
 
+### Introduction to GraphQL
+
+- **Event:** AngularBeers Meetup
+- **Date:** October 20, 2016
+- **Location:** Barcelona, Spain
+- **Speaker:** Kamil Kisiela
+- **Link:** http://www.meetup.com/AngularJS-Beers/events/234353768/
+
+Kamil is a front-end engineer from Warszawa and a member of the angular-meteor team. He helped build Angular 2 integration for ApolloStack. He is passionate about learning new stuff and developing new things. He loves a journey called Life. Based in Warsaw, Poland.
+Use this opportunity to ask him questions about this topic and a good excuse to visit Barcelona☀️!
+
 ### Building better mobile apps with GraphQL
 
 - **Event:** Reactive Conf
@@ -72,6 +83,13 @@ As our applications grow larger and our models and views become more and more co
 - **Speakers:** Samer Buna, Armand Aquino, Kyle Matthews
 - **Link:** http://www.meetup.com/Declarative-Programmers/events/233430457/
 
+### [Workshop] Working with GraphQL on Angular application
+
+- **Date:** October 22, 2016
+- **Location:** Barcelona, Catalonia, Spain
+- **Speakers:** Kamil Kisiela
+- **Link:** http://www.meetup.com/AngularJS-Beers/events/234354326/
+
 ### GraphQL Summit
 
 - **Date:** October 26, 2016

site/graphql-js/APIReference-ExpressGraphQL.md

@@ -11,7 +11,7 @@ The `express-graphql` module provides a simple way to create an [Express](https:
 
 ```js
 import graphqlHTTP from 'express-graphql'; // ES6
-var graphqlHTTP = require('graphql'); // CommonJS
+var graphqlHTTP = require('express-graphql'); // CommonJS
 ```
 
 ### graphqlHTTP

site/learn/Learn-Introspection.md

@@ -50,7 +50,7 @@ __Directive** - These all are preceded with a double underscore, indicating
 that they are part of the introspection system.
 
 Now, let's try and figure out a good place to start exploring what queries are
-available. When we designed out type system, we specified what type all queries
+available. When we designed our type system, we specified what type all queries
 would start at; let's ask the introspection system about that!
 
 ```graphql

site/learn/Learn-Queries.md

@@ -254,7 +254,7 @@ query HeroForEpisode($ep: Episode!) {
 
 In this query, the `hero` field returns the type `Character`, which might be either a `Human` or a `Droid` depending on the `episode` argument. In the direct selection, you can only ask for fields that exist on the `Character` interface, such as `name`.
 
-To ask for a field on the concrete type, you need to use an _inline fragment_ with a type condition. Because the first fragment is labeled as `... on Droid`, the `primaryFunction` field will only be executed if the `Character` returned from `hero` is of the `Droid` type. Similarly for the `homePlanet` field for the `Human` type.
+To ask for a field on the concrete type, you need to use an _inline fragment_ with a type condition. Because the first fragment is labeled as `... on Droid`, the `primaryFunction` field will only be executed if the `Character` returned from `hero` is of the `Droid` type. Similarly for the `height` field for the `Human` type.
 
 Named fragments can also be used in the same way, since a named fragment always has a type attached.
 

site/users/index.html.js

@@ -226,6 +226,16 @@ var logos = [
     img: 'ustglobal.png',
     link: 'http://www.ust-global.com/'
   },
+  {
+    name: 'Sale Stock',
+    img: 'salestock.png',
+    link: 'https://www.salestockindonesia.com'
+  },
+  {
+    name: 'IndonesiaX',
+    img: 'indonesiax.png',
+    link: 'https://www.indonesiax.co.id'
+  },
   // Adding your logo?
   // Add it to the /users/logos/ directory and then append an entry above this comment.
   //