Merge branch 'v1' of github.com:pixelandtonic/ElementAPI into v2

# Conflicts:
#	CHANGELOG.md
#	elementapi/ElementApiPlugin.php
#	elementapi/controllers/ElementApiController.php
#	releases.json

Author: brandonkelly

CHANGELOG.md

@@ -50,6 +50,11 @@ Changelog
 ### Deprecated
 - Deprecated the `first` endpoint config setting. Use `one` instead.
 
+## 1.6.0 - 2017-05-25
+
+### Added
+- Added the `include` and `exclude` endpoint config settings. ([#41](https://github.com/craftcms/element-api/pull/41))
+
 ## 1.5.0 - 2017-05-24
 
 ### Added

README.md

@@ -173,7 +173,7 @@ The query string param name that should be used to identify which page is being
 
 Note that it cannot be set to `'p'` because that’s the parameter Craft uses to check the requested path.
 
-### `resourceKey`
+#### `resourceKey`
 
 The key that the elements should be nested under in the response data. By default this will be `'data'`.
 
@@ -203,6 +203,45 @@ Possible values are:
 - `'jsonFeed'` – formats data based on [JSON Feed V1](https://jsonfeed.org/version/1) (see the [JSON Feed](#json-feed) example below).
 - A custom serializer instance.
 
+#### `includes`
+
+The [include names](http://fractal.thephpleague.com/transformers/#including-data) that should be included for the current request, if any.
+
+```php
+'includes' => craft()->request->getQuery('include'),
+```
+
+Note that this setting requires a custom transformer class that’s prepped to handle includes:
+
+```php
+class MyTransformerClassName extends TransformerAbstract
+{
+    protected $availableIncludes = ['author'];
+
+    public function includeAuthor(EntryModel $entry)
+    {
+        return $this->item($entry->author, function(UserModel $author) {
+            return [
+                'id' => $author->id,
+                'name' => $author->name,
+            ];
+        });
+    }
+
+    // ...
+}
+```
+
+#### `excludes`
+
+The [include names](http://fractal.thephpleague.com/transformers/#including-data) that should be excluded for the current request, which would otherwise have been included (e.g. if they were listed as a default include), if any.
+
+```php
+'excludes' => 'author',
+```
+
+Like [`includes`](#includes), this setting requires a custom transformer class.
+
 #### `jsonOptions`
 
 The value of the `$options` argument that will be passed to [`json_encode()`](http://php.net/manual/en/function.json-encode.php) when preparing the response. By default `JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE` will be passed.