Small template tweaks
Merge branch 'master' into stable
Secure all traffic with SSL
Merge branch 'master' into stable