Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docs/INSTALL.rst

Merge pull request AppDaemon#288 from M-o-a-T/upstream

two more

Add upgrading from 2.x section

docs

Fix up for python 3.6 dash updates

Date Change log

Error if no config file supplied

Tagged 2.1.12

input_slider and input_number refactor

Update conf examples