switched client to https
Merge branch 'https'