Merge branch 'calamares' of https://github.com/calamares/calamares into development

CHANGES-3.3

CMakeLists.txt

src/calamares/CalamaresWindow.cpp

src/libcalamares/geoip/Interface.h

src/libcalamaresui/ViewManager.cpp

src/libcalamaresui/ViewManager.h

src/libcalamaresui/viewpages/ViewStep.cpp

src/libcalamaresui/viewpages/ViewStep.h

src/modules/keyboard/AdditionalLayoutInfo.h

src/modules/keyboard/Config.cpp

src/modules/keyboard/Config.h

src/modules/keyboard/KeyboardViewStep.cpp

src/modules/keyboard/KeyboardViewStep.h

src/modules/keyboardq/KeyboardQmlViewStep.cpp

src/modules/keyboardq/KeyboardQmlViewStep.h

src/modules/locale/Config.cpp

src/modules/locale/Config.h

src/modules/locale/LocaleViewStep.cpp

src/modules/locale/LocaleViewStep.h

src/modules/localeq/LocaleQmlViewStep.cpp