commit to move code from laptop to pc
Merge branch 'master' of https://github.com/QGIS-Unibern/MasterPlugin