Merge github.com:kelvan/gotoVienna into experimental

Conflicts:
	qml/MainPage.qml

diff --cc gotovienna-qml
Simple merge

diff --cc qml/MainPage.qml
index 3f23ba2,5c91374..8a6c4cc
--- 1/qml/MainPage.qml
--- 2/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@@ -106,7 -57,9 +106,8 @@@ Page 
              // set selectedIndex in lineSelector to the right item
              gstation.text = ''
  
 -            text = text.toUpperCase()
 -
 -            if (lineSelector.selectedIndex == -1) {
 +            if (lineSelector.selectedIndex === -1) {
++                text = text.toUpperCase()
                  return
              }