updates user and event schemas to match json format
Merge branch 'jacshfr-jsschemas'