Fix services stomping on each other's device tokens
Merge pull request #11 from lloydmeta/hotfix/different_services_stomping

Fix services stomping on each other's device tokens