fix bug and create test for bug pushToken
Merge pull request #560 from baasbox/issue_553_bug_with_pushToken

fix bug and create test for bug pushToken
Merge pull request #1 from baasbox/master

pull request from repository baasbox