add tests
Resolve merge conflicts
Resolve merge conflicts
Basic push notifications
add tests
Merge branch 'push_notifications'
code update
Merge branch 'add_tests'
fix route
fix schema; update tests; update api doc