Merge pull request #34 from techiev2/users

Adds Device model for device/user mapping and registration flow changes
Merge pull request #35 from techiev2/events

Fixes issue #33