New hook system
fix typo
Merge branch 'master' into hooks
Merge pull request #3266 from owncloud/hooks

New hook system