Preparing release 1.2.5
Back to development: 1.2.6
Merge branch 'develop' of github.com:makinacorpus/django-mapentity into develop

Conflicts:
	CHANGES
	setup.py
Test for filtered headers