Merge remote-tracking branch 'origin/dev' into dev
#224 Introduction of the field calculation
#224 Introduction of the field calculation
Merge branch 'feature/224_field_calculation' into dev