mergingMerge branch 'develop' of https://github.com/agile-geoscience/agilegeo into develop
mergingMerge branch 'develop' of https://github.com/agile-geoscience/agilegeo into develop

agile-geoscience/agilegeo,Kramer477/bruges,kinverarity1/bruges,agile-geoscience/bruges,TobbeTripitaka/bruges