Merge branch 'dev'
Add push and pull classes
Merge branch 'feature/push-pull' into dev