Added https support
Minor fix for activate https
Merge branch 'feature/https' into develop