Merge branch 'stev-0-master'
frontend/qml: Can now switch tabs again #296. Watch "." for qml files