Merge remote branch 'oldgit/master'

* oldgit/master:
  Remove all sounds but doorbell.
  Add links to SAPO maps.
  Add skyscraper ad.
  Add legal notice.
  No effects for SAPO.
  The Desktop handler is not production ready yet.
  Add SAPO map driver.
  Add link to SAPO calendar portal.
  Add custom help links.
  Add SAPO bar.

diff --cc kronolith/js/kronolith.js
Simple merge

diff --cc kronolith/templates/chunks/calendar.php
Simple merge

diff --cc kronolith/templates/chunks/permissions.inc
Simple merge

diff --cc kronolith/templates/common-header.inc
Simple merge

diff --cc kronolith/templates/itip/notification.html.php
Simple merge