Revert "TvRemoteViewer_VB 0.31"

This reverts commit 5d99b0c28a9be84d99c0640ff084f1eb7117422a.
Revert "Revert "TvRemoteViewer_VB 0.31""

This reverts commit fe84dbde8901160ee8cc03c6b563a5960030a006.
Merge branch 'master' into develop