the event property must also be set in the edition javascript
remove limite of 1000 characters in url stored in shorturl table
Merge pull request #1159 from camptocamp/remove_limit_on_url

remove limite of 1000 characters in url stored in shorturl table
Merge pull request #1158 from camptocamp/protected_content_warning

the event property must also be set in the edition javascript
Merge remote-tracking branch 'origin/1.5'

Conflicts:
	c2cgeoportal/models.py