Update README.md
Update README.md
Conflict in readme fixed
Merge branch 'dev'
Merge branch 'master' of https://github.com/bagabont/unified-push-notifications-service
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
config updated