vuplus: (temporarily) disable the deviceinfo as it is broken in openwebif
fix conflicts for merging upstream/master
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from jdembski/master

Merge jdembski master branch