preping files
Merge branch 'master' of https://github.com/librecms/librecms-api
correctly toggle events
Merge branch 'master' of https://github.com/librecms/librecms-api