Merge branch 'master' into dev

# Conflicts:
#	docs/configuration/configuration.md
#	docs/getting_started/pairing_devices.md
#	docs/index.md
#	docs/information/mqtt_topics_and_message_structure.md

docs/getting_started/flashing_the_cc2531.md

@@ -19,10 +19,10 @@ The CC2531 USB stick needs to be flashed with a custom firmware.
 Credits to [@Frans-Willem](https://github.com/frans-Willem) for majority of instructions.
 
 1. Install prerequisites for [CC-Tool](https://github.com/dashesy/cc-tool) using a package manager (e.g. [Homebrew](https://brew.sh/) for macOS)
-> Ubuntu: dh-autoreconf, libusb-1.0, libboost-all-dev
-> Fedora: dh-autoreconf, boost-devel, libusb1-devel
-> Archlinux: dh-autoreconf, libusb, boost
-> macOS: autoconf, automake, libusb, boost, pkgconfig, libtool
+* Ubuntu: dh-autoreconf, libusb-1.0, libboost-all-dev
+* Fedora: dh-autoreconf, boost-devel, libusb1-devel
+* Archlinux: dh-autoreconf, libusb, boost
+* macOS: brew install autoconf automake libusb boost pkgconfig libtool
 
 2. Build cc-tool
 ```bash

docs/getting_started/pairing_devices.md

@@ -1,4 +1,5 @@
 **IMPORTANT:** Before you start, make sure that `permit_join: true` is set in your `configuration.yaml`. Otherwise new devices cannot join the network!
+It's equally important that `permit_join: false` is set in your `configuration.yaml` after initial setup is done to keep your Zigbee network safe and to avoid accidental joining of other Zigbee devices.
 
 Start by checking if your Zigbee device is supported, see  [Supported devices](../information/supported_devices.md).