Add missing columns in intervention exports (ref #1167)
Fix toggling test
Upgrade paperclip with Star feature
Use starred attachments for main picture (fixes #1117)
Ability to edit attachments from detail pages directly (fixes #177, fixes #455, fixes #1164)
Upgrade mapentity
Merge branch '177_edit_attachments' into develop
Merge branch '1117_control_main_picture' into develop

Conflicts:
	conf/buildout.cfg
	docs/changelog.rst
Merge branch '1167_maintenance_exports_columns' into develop
Add ability to add/change/delete zoning objects in Adminsite (ref #1246)
Experimental features flag in settings.ini
Adjust upgrade instruction
Merge pull request #1262 from makinacorpus/zoning_in_admin

Add ability to add/change/delete zoning objects in Adminsite (ref #1246)
Merge pull request #1263 from makinacorpus/experimental_features

Experimental features flag in settings.ini
Create and register new model TouristicContent
Icon for TouristicContent model
Views and Form for TouristicContent model
Filter for TouristicContent model
Detail template for TouristicContent model
Fix test_denormalized_path_trails test