Merge branch 'development'

Conflicts:
	vendor/scabbia/events.php