updated event names
merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	Alicephp/Hooks/console_hooks.php