Merge branch 'develop' - use pods, data source changes, subscribe to push
Updated version
Merged in develop
Merged in devlop