pentaho/pentaho-platform — pull request #1733 by kolinus (2014-08-01 15:11:13+00:00)
Title: CUST-170 - ANALYZER-1961 - Displaying Geo Maps in HTTPS/SSL configured B...

...I Server results in mixed content and errors in Analyzer

What was done:
1) fixing merge issue