dandrits conf
Merge branch 'master' of https://github.com/diyiot-tools/DIYiotServer
Merge https://github.com/diyiot-tools/DIYiotServer
test
Merge branch 'master' of https://github.com/diyiot-tools/DIYiotServer