Merge branch 'polygonCapture' of
https://zamiaDroid@github.com/zamiaDroid/zamiaDroid.git into
polygonCapture