Merge branch '2.x' into 2.x-autoload-site-class

# Conflicts:
#	README.md

Author: gchtr

README.md

@@ -27,7 +27,7 @@ Small tip: You can make use of Composer’s [autoloading functionality](https://
 
 - `static/` is where you can keep your static front-end scripts, styles, or images. In other words, your Sass files, JS files, fonts, and SVGs would live here.
 - `views/` contains all of your Twig templates. These pretty much correspond 1 to 1 with the PHP files that respond to the WordPress template hierarchy. At the end of each PHP template, you’ll notice a `Timber::render()` function whose first parameter is the Twig file where that data (or `$context`) will be used. Just an FYI.
-- `tests/` ... basically don’t worry about (or remove) these unless you know what they are and want to.
+- `tests/` ... basically don’t worry about (or remove) this unless you know what it is and want to.
 
 ## Other Resources