Resolve conflicts
Update Changelog
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Update ChangeLog
Updates
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Spelling fix
Merge pull request #802 from simnandez/develop

Fix: Try to showing the events related to a intervention