Spec
Clean add_device_token code
Merge branch 'refs/heads/cleanup_errors' into dev
bump version
Merge branch 'refs/heads/dev'