remove http://
Merge branch 'dev' into dev-kelly
Merge branch 'dev-kelly' into dev