Merge branch 'master' into develop

Conflicts:
	VERSION
	docs/changelog.rst
	geotrek/trekking/models.py