Merge branch 'dev' into test
user tests fixes
pusher fixes
pusher fixes
tests fixes
Merge branch 'test' into dev