Undo changes to getting website url
Merge remote-tracking branch 'origin/butterflyknife' into dev