Adding device_id to users for push notifications.
Merge branch 'master' of https://github.com/Flux159/hacknyc

Merging users fix.