step 1
Merge branch 'master' of https://github.com/vmora/workshop-qgisplateform
step 2