Changed events db from camel case to snake case
Merge branch 'master' into branch1