Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	homeassistant/components/recorder/__init__.py
	homeassistant/const.py
	requirements_all.txt
	setup.py

setup.py

@@ -26,8 +26,8 @@ setup(
     license='MIT License',
     url='https://home-assistant.io/',
     download_url=DOWNLOAD_URL,
-    author='Paulus Schoutsen',
-    author_email='paulus@paulusschoutsen.nl',
+    author='Home Assistant',
+    author_email='hello@home-assistant.io',
     description='Open-source home automation platform running on Python 3.',
     packages=PACKAGES,
     include_package_data=True,