Removed 'origin ' from the push + pull
Merge branch 'master' into django17