add user class
refactor event model
Merge remote-tracking branch 'origin/master'