add pull and push for origin/master and origin/develop
Merge branch 'develop'