Merge remote-tracking branch 'origin/1.4'

Conflicts:
	c2cgeoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl
	c2cgeoportal/views/mapserverproxy.py
	setup.py