Merge branch 'master' into rduran/new-events

Conflicts:
	main/core/ChangeLog
Merge branch 'rduran/new-events' of github.com:Zentyal/zentyal into rduran/new-events
Merge branch 'rduran/new-events' of github.com:Zentyal/zentyal into rduran/new-events

Conflicts:
	main/core/ChangeLog