Fix JSON formatting of object attachment lists in API
Bump version
Merge branch 'develop'

Conflicts:
	VERSION
	docs/changelog.rst
	docs/conf.py
Bump version
Rollback salt customization
Upgrade mapentity
Bump version
Update gtrois import conf
Merge pull request #1171 from makinacorpus/add_guillestrois_config

Update gtrois import conf
Add demo configuration
Merge pull request #1173 from makinacorpus/add_demo_configuration

Add demo configuration
Fix search among attached files in Adminsite (fixes #1172)
Bump version
Minor changelog changes
Generate images and elevation charts
Deploy customizations with Salt
Move deploy configurations to respective folders
Merge pull request #1176 from makinacorpus/salt_generate_images

Salt to generate images and deploy customizations
Move Salt deployment to MC Gitorious