merged from master
fixed ssl config for Apache 2.4
Merge branch 'master' into dev
fixed paths to logo