add https check
Merge branch 'dev'
Merge remote-tracking branch 'origin/master'

Conflicts:
	mobile/index.html