vuplus: (temporarily) disable the deviceinfo as it is broken in openwebif
fix conflicts for merging upstream/master
Merge pull request #3 from jdembski/master

Merge jdemski master branch