Merge branch 'fix-rm_version'
Update README.md
Merge branch 'release-3.1.0'
Merge branch 'release-3.1.0'
Merge branch 'master' of github.com:chocoteam/choco3
Merge branch 'hotfix-3.1.0.1'

Conflicts:
	README.md
Merge branch 'master' into develop
Merge branch 'develop' into feature-expsum
[EXP] explain PropSumEq
Merge branch 'feature-expsum' into develop