Back to development: 0.20
Restore pk property in Trek GeoJSON layer
Merge tag '0.19.1'

Conflicts:
	CHANGES
	VERSION
Edit difficulty id in Admin site, mainly used to order difficulty levels (fixes #771)