Relax HTTPS requirement for admin interface - no point in running SSL over SSH
Merge branch 'master' into deploy