Fixed httpS issues (unsafe content) in some places.
Merge pull request #1081 from ahukkanen/https_fixes

Fixed httpS issues (unsafe content) in some places.