ok
okMerge branch 'master' of https://github.com/jbclavel/appli

Conflicts:
	pappl.pro
Merge branch 'master' of https://github.com/jbclavel/appli
Merge branch 'master' of https://github.com/jbclavel/appli

Conflicts:
	pappl.pro
okMerge branch 'master' of https://github.com/jbclavel/appli

Conflicts:
	src/ui/ConnectionSettings.cpp
okMerge branch 'master' of https://github.com/jbclavel/appli
Merge branch 'master' of https://github.com/jbclavel/appli
Commit for pull
Merge branch 'master' of https://github.com/jbclavel/appli