Merge branch 'origin/develop'
Merge branch 'origin/develop'
Merge branch 'origin/develop'
Merge branch 'origin/develop'
Merge branch 'origin/develop'
Merge commit '1ac5c833fa1246dd7e97973d451d7454b13dc1f5'
Merge commit 'cb2e65f908d763a1e1179ab0f398f8f92632df0b'
Updated urls for the new dev vps
Finish update-url