Update site

21 files changed, 339 insertions, 345 deletions

diff --git a/documentation/4.1/api/lib/annotation.svg b/documentation/4.1/api/lib/annotation.svg
new file mode 100644
index 0000000..66063fa
--- /dev/null
+++ b/documentation/4.1/api/lib/annotation.svg
@@ -0,0 +1,54 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
+      </feMerge>
+    </filter>
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="#50CC93" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <text id="@" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="12" y="46">
+              @
+            </tspan>
+          </text>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/documentation/4.1/api/lib/annotation_comp.svg b/documentation/4.1/api/lib/annotation_comp.svg
new file mode 100644
index 0000000..fe6dcd7
--- /dev/null
+++ b/documentation/4.1/api/lib/annotation_comp.svg
@@ -0,0 +1,57 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
+      </feMerge>
+    </filter>
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="#2C6C8D" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <rect id="Rectangle-2" opacity="0.3" fill="#000000" mask="url(#mask-3)" x="-8" y="33" width="80" height="31"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <use id="Mask" fill="#50CC93" filter="url(#filter-4)" xlink:href="#path-5"/>
+          <text id="@" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="12" y="46">
+              @
+            </tspan>
+          </text>
+          <rect id="Rectangle-2" opacity="0.190065299" fill="#000000" mask="url(#mask-6)" x="-8" y="2" width="80" height="31"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/documentation/4.1/api/lib/diagrams.css b/documentation/4.1/api/lib/diagrams.css
index 08add0e..9dcafdb 100644
--- a/documentation/4.1/api/lib/diagrams.css
+++ b/documentation/4.1/api/lib/diagrams.css
@@ -30,7 +30,7 @@
 }
 
 .diagram-container {
-  display: none;
+  display: block;
 }
 
 .diagram-container > span.toggle {
@@ -39,13 +39,15 @@
 
 .diagram {
   overflow: hidden;
+  display: none;
   padding-top:15px;
 }
 
 .diagram svg {
   display: block;
-  position: absolute;
-  visibility: hidden;
+  position: static;
+  visibility: visible;
+  z-index: auto;
   margin: auto;
 }
 
@@ -73,6 +75,11 @@
   text-decoration: none;
 }
 
+#inheritance-diagram {
+    padding-bottom: 20px;
+}
+
+
 #inheritance-diagram-container > span.toggle {
   z-index: 2;
 }
@@ -136,68 +143,35 @@ svg text {
   font-size: 8.5px;
 }
 
-/* try to move the node text 1px in order to be vertically
- * centered (does not work in all browsers)
- */
-svg .node text {
-  transform: translate(0px,1px);
-  -ms-transform: translate(0px,1px);
-  -webkit-transform: translate(0px,1px);
-  -o-transform: translate(0px,1px);
-  -moz-transform: translate(0px,1px);
-}
-
-/* hover effect for edges */
-
-svg .edge.over text,
-svg .edge.implicit-incoming.over polygon,
-svg .edge.implicit-outgoing.over polygon {
-  fill: #103A51;
-}
-
-svg .edge.over path,
-svg .edge.over polygon {
-  stroke: #103A51;
-}
 
-/* for hover effect on nodes in diagrams, edit the following */
-svg.class-diagram .node {}
-svg.class-diagram .node.this {}
-svg.class-diagram .node.over {}
-
-svg .node.over polygon {
-  stroke: #202020;
+svg {
+  border: 1px solid #999;
+  overflow: hidden;
 }
 
-/* hover effect for nodes in package diagrams */
-
-svg.package-diagram .node.class.over polygon,
-svg.class-diagram .node.this.class.over polygon {
-  fill: #098552;
-  fill: #04663e;
+svg .node {
+  white-space: nowrap;
 }
 
-svg.package-diagram .node.trait.over polygon,
-svg.class-diagram .node.this.trait.over polygon {
-  fill: #3c7b9b;
-  fill: #235d7b;
+svg .node rect,
+svg .node circle,
+svg .node ellipse {
+  stroke: #333;
+  fill: #fff;
+  stroke-width: 1.5px;
 }
 
-svg.package-diagram .node.type.over polygon,
-svg.class-diagram .node.this.type.over polygon {
-  fill: #098552;
-  fill: #04663e;
+svg .cluster rect {
+  stroke: #333;
+  fill: #000;
+  fill-opacity: 0.1;
+  stroke-width: 1.5px;
 }
 
-
-svg.package-diagram .node.object.over polygon {
-  fill: #183377;
+svg .edgePath path.path {
+  stroke: #333;
+  stroke-width: 1.5px;
+  fill: none;
 }
 
-svg.package-diagram .node.outside.over polygon {
-  fill: #d4d4d4;
-}
 
-svg.package-diagram .node.default.over polygon {
-  fill: #d4d4d4;
-}
diff --git a/documentation/4.1/api/lib/diagrams.js b/documentation/4.1/api/lib/diagrams.js
deleted file mode 100644
index b137327..0000000
--- a/documentation/4.1/api/lib/diagrams.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * JavaScript functions enhancing the SVG diagrams.
- *
- * @author Damien Obrist
- */
-
-var diagrams = {};
-
-/**
- * Initializes the diagrams in the main window.
- */
-$(document).ready(function()
-{
-	// hide diagrams in browsers not supporting SVG
-	if(Modernizr && !Modernizr.inlinesvg)
-		return;
-
-	if($("#content-diagram").length)
-		$("#inheritance-diagram").css("padding-bottom", "20px");
-
-	$(".diagram-container").css("display", "block");
-
-	$(".diagram").each(function() {
-		// store initial dimensions
-		$(this).data("width", $("svg", $(this)).width());
-		$(this).data("height", $("svg", $(this)).height());
-		// store unscaled clone of SVG element
-		$(this).data("svg", $(this).get(0).childNodes[0].cloneNode(true));
-	});
-
-	// make diagram visible, hide container
-	$(".diagram").css("display", "none");
-	$(".diagram svg").css({
-		"position": "static",
-		"visibility": "visible",
-		"z-index": "auto"
-	});
-
-	// enable linking to diagrams
-	if($(location).attr("hash") == "#inheritance-diagram") {
-		diagrams.toggle($("#inheritance-diagram-container"), true);
-	} else if($(location).attr("hash") == "#content-diagram") {
-		diagrams.toggle($("#content-diagram-container"), true);
-	}
-
-	$(".diagram-link").click(function() {
-		diagrams.toggle($(this).parent());
-	});
-
-	// register resize function
-	$(window).resize(diagrams.resize);
-
-	// don't bubble event to parent div
-	// when clicking on a node of a resized
-	// diagram
-	$("svg a").click(function(e) {
-		e.stopPropagation();
-	});
-
-	diagrams.initHighlighting();
-
-    $("button#diagram-fs").click(function() {
-        $(".diagram-container").toggleClass("full-screen");
-        $(".diagram-container > div.diagram").css({
-            height: $("svg").height() + "pt"
-        });
-
-        $panzoom.panzoom("reset", { animate: false, contain: false });
-    });
-});
-
-/**
- * Initializes highlighting for nodes and edges.
- */
-diagrams.initHighlighting = function()
-{
-	// helper function since $.hover doesn't work in IE
-
-	function hover(elements, fn)
-	{
-		elements.mouseover(fn);
-		elements.mouseout(fn);
-	}
-
-	// inheritance edges
-
-	hover($("svg .edge.inheritance"), function(evt){
-		var toggleClass = evt.type == "mouseout" ? diagrams.removeClass : diagrams.addClass;
-		var parts = $(this).attr("id").split("_");
-		toggleClass($("#" + parts[0] + "_" + parts[1]));
-		toggleClass($("#" + parts[0] + "_" + parts[2]));
-		toggleClass($(this));
-	});
-
-	// nodes
-
-	hover($("svg .node"), function(evt){
-		var toggleClass = evt.type == "mouseout" ? diagrams.removeClass : diagrams.addClass;
-		toggleClass($(this));
-		var parts = $(this).attr("id").split("_");
-		var index = parts[1];
-		$("svg#" + parts[0] + " .edge.inheritance").each(function(){
-			var parts2 = $(this).attr("id").split("_");
-			if(parts2[1] == index)
-			{
-				toggleClass($("#" + parts2[0] + "_" + parts2[2]));
-				toggleClass($(this));
-			} else if(parts2[2] == index)
-			{
-				toggleClass($("#" + parts2[0] + "_" + parts2[1]));
-				toggleClass($(this));
-			}
-		});
-	});
-
-	// incoming implicits
-
-	hover($("svg .node.implicit-incoming"), function(evt){
-		var toggleClass = evt.type == "mouseout" ? diagrams.removeClass : diagrams.addClass;
-		toggleClass($(this));
-		toggleClass($("svg .edge.implicit-incoming"));
-		toggleClass($("svg .node.this"));
-	});
-
-	hover($("svg .edge.implicit-incoming"), function(evt){
-		var toggleClass = evt.type == "mouseout" ? diagrams.removeClass : diagrams.addClass;
-		toggleClass($(this));
-		toggleClass($("svg .node.this"));
-		$("svg .node.implicit-incoming").each(function(){
-			toggleClass($(this));
-		});
-	});
-
-	// implicit outgoing nodes
-
-	hover($("svg .node.implicit-outgoing"), function(evt){
-		var toggleClass = evt.type == "mouseout" ? diagrams.removeClass : diagrams.addClass;
-		toggleClass($(this));
-		toggleClass($("svg .edge.implicit-outgoing"));
-		toggleClass($("svg .node.this"));
-	});
-
-	hover($("svg .edge.implicit-outgoing"), function(evt){
-		var toggleClass = evt.type == "mouseout" ? diagrams.removeClass : diagrams.addClass;
-		toggleClass($(this));
-		toggleClass($("svg .node.this"));
-		$("svg .node.implicit-outgoing").each(function(){
-			toggleClass($(this));
-		});
-	});
-};
-
-/**
- * Resizes the diagrams according to the available width.
- */
-diagrams.resize = function() {
-    // available width
-    var availableWidth = $(".diagram-container").width();
-
-    $(".diagram-container").each(function() {
-        // unregister click event on whole div
-        $(".diagram", this).unbind("click");
-        var diagramWidth = $(".diagram", this).data("width");
-        var diagramHeight = $(".diagram", this).data("height");
-
-        if (diagramWidth > availableWidth) {
-            // resize diagram
-            var height = diagramHeight / diagramWidth * availableWidth;
-            $(".diagram svg", this).width(availableWidth);
-            $(".diagram svg", this).height(height);
-        } else {
-            // restore full size of diagram
-            $(".diagram svg", this).width(diagramWidth);
-            $(".diagram svg", this).height(diagramHeight);
-            // don't show custom cursor any more
-            $(".diagram", this).removeClass("magnifying");
-        }
-    });
-};
-
-/**
- * Shows or hides a diagram depending on its current state.
- */
-diagrams.toggle = function(container, dontAnimate)
-{
-    // change class of link
-    $(".diagram-link", container).toggleClass("open");
-    // get element to show / hide
-    var div = $(".diagram", container);
-    if (div.is(':visible')) {
-        $(".diagram-help", container).hide();
-        div.unbind("click");
-        div.slideUp(100);
-
-        $("#diagram-controls", container).hide();
-        $("#inheritance-diagram-container").unbind('mousewheel.focal');
-    } else {
-        diagrams.resize();
-        if(dontAnimate)
-            div.show();
-        else
-            div.slideDown(100);
-        $(".diagram-help", container).show();
-
-        $("#diagram-controls", container).show();
-
-        $(".diagram-container").on('mousewheel.focal', function(e) {
-            e.preventDefault();
-            var delta = e.delta || e.originalEvent.wheelDelta;
-            var zoomOut = delta ? delta < 0 : e.originalEvent.deltaY > 0;
-            $panzoom.panzoom('zoom', zoomOut, {
-                increment: 0.1,
-                animate: true,
-                focal: e
-            });
-        });
-    }
-};
-
-/**
- * Helper method that adds a class to a SVG element.
- */
-diagrams.addClass = function(svgElem, newClass) {
-	newClass = newClass || "over";
-	var classes = svgElem.attr("class");
-	if ($.inArray(newClass, classes.split(/\s+/)) == -1) {
-		classes += (classes ? ' ' : '') + newClass;
-		svgElem.attr("class", classes);
-	}
-};
-
-/**
- * Helper method that removes a class from a SVG element.
- */
-diagrams.removeClass = function(svgElem, oldClass) {
-	oldClass = oldClass || "over";
-	var classes = svgElem.attr("class");
-	classes = $.grep(classes.split(/\s+/), function(n, i) { return n != oldClass; }).join(' ');
-	svgElem.attr("class", classes);
-};
diff --git a/documentation/4.1/api/lib/index.css b/documentation/4.1/api/lib/index.css
index 57c7dd8..bfe9ec9 100644
--- a/documentation/4.1/api/lib/index.css
+++ b/documentation/4.1/api/lib/index.css
@@ -31,6 +31,56 @@
   url('open-sans-v13-latin-regular.woff') format('woff'),
   url('open-sans-v13-latin-regular.ttf') format('truetype');
 }
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 400;
+  src: url('open-sans-v13-latin-400i.eot');
+  src: local('Open Sans Italic'), local('OpenSans-Italic'),
+  url('open-sans-v13-latin-400i.eot?#iefix') format('embedded-opentype'),
+  url('open-sans-v13-latin-400i.woff') format('woff'),
+  url('open-sans-v13-latin-400i.ttf') format('truetype');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: oblique;
+  font-weight: 400;
+  src: url('open-sans-v13-latin-400i.eot');
+  src: local('Open Sans Italic'), local('OpenSans-Italic'),
+  url('open-sans-v13-latin-400i.eot?#iefix') format('embedded-opentype'),
+  url('open-sans-v13-latin-400i.woff') format('woff'),
+  url('open-sans-v13-latin-400i.ttf') format('truetype');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: url('open-sans-v13-latin-700.eot');
+  src: local('Open Sans Bold'), local('OpenSans-Bold'),
+  url('open-sans-v13-latin-700.eot?#iefix') format('embedded-opentype'),
+  url('open-sans-v13-latin-700.woff') format('woff'),
+  url('open-sans-v13-latin-700.ttf') format('truetype');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: italic;
+  font-weight: 700;
+  src: url('open-sans-v13-latin-700i.eot');
+  src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'),
+  url('open-sans-v13-latin-700i.eot?#iefix') format('embedded-opentype'),
+  url('open-sans-v13-latin-700i.woff') format('woff'),
+  url('open-sans-v13-latin-700i.ttf') format('truetype');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: oblique;
+  font-weight: 700;
+  src: url('open-sans-v13-latin-700i.eot');
+  src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'),
+  url('open-sans-v13-latin-700i.eot?#iefix') format('embedded-opentype'),
+  url('open-sans-v13-latin-700i.woff') format('woff'),
+  url('open-sans-v13-latin-700i.ttf') format('truetype');
+}
 
 @font-face {
   font-family: 'Source Code Pro';
@@ -61,6 +111,10 @@
   margin: 0px;
 }
 
+u { 
+  text-decoration: underline; 
+}
+
 a {
   cursor: pointer;
   text-decoration: none;
@@ -495,6 +549,11 @@ div#packages > ul > li > a.abstract.type {
   background-size: 0.9rem;
 }
 
+div#packages > ul > li > a.annotation {
+  background: url("annotation.svg") no-repeat center;
+  background-size: 0.9rem;
+}
+
 div#packages > ul > li > a {
   text-decoration: none !important;
   margin-left: 1px;
@@ -652,6 +711,12 @@ div#results-content > div#entity-results > ul.entities > li > .icon.class {
   background-size: 1em 1em;
 }
 
+div#results-content > div#member-results > ul.entities > li > .icon.annotation,
+div#results-content > div#entity-results > ul.entities > li > .icon.annotation {
+  background: url("annotation.svg") no-repeat center;
+  background-size: 1em 1em;
+}
+
 div#results-content > div#member-results > ul.entities > li > .icon.trait,
 div#results-content > div#entity-results > ul.entities > li > .icon.trait {
   background: url("trait.svg") no-repeat center;
diff --git a/documentation/4.1/api/lib/index.js b/documentation/4.1/api/lib/index.js
index 087c975..33b49b6 100644
--- a/documentation/4.1/api/lib/index.js
+++ b/documentation/4.1/api/lib/index.js
@@ -561,10 +561,12 @@ function searchAll() {
     entityH1.innerHTML = "Entity results";
     entityResults.appendChild(entityH1);
 
-    $("div#results-content")
-        .prepend("<span class='search-text'>"
-                +"  Showing results for <span class='query-str'>\"" + searchStr + "\"</span>"
-                +"</span>");
+    $("div#results-content").prepend(
+        $("<span>")
+            .addClass("search-text")
+            .append(document.createTextNode("  Showing results for "))
+            .append($("<span>").addClass("query-str").text(searchStr))
+    );
 
     var regExp = compilePattern(searchStr);
 
diff --git a/documentation/4.1/api/lib/jquery.mousewheel.min.js b/documentation/4.1/api/lib/jquery.mousewheel.min.js
deleted file mode 100644
index 03bfd60..0000000
--- a/documentation/4.1/api/lib/jquery.mousewheel.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * jQuery Mousewheel 3.1.13
- *
- * Copyright 2015 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a:a(jQuery)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||f>n)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120===0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b),d=c["offsetParent"in a.fn?"offsetParent":"parent"]();return d.length||(d=a("body")),parseInt(d.css("fontSize"),10)||parseInt(c.css("fontSize"),10)||16},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})});
\ No newline at end of file
diff --git a/documentation/4.1/api/lib/jquery.panzoom.min.js b/documentation/4.1/api/lib/jquery.panzoom.min.js
deleted file mode 100644
index 7c3be68..0000000
--- a/documentation/4.1/api/lib/jquery.panzoom.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @license jquery.panzoom.js v2.0.5
- * Updated: Thu Jul 03 2014
- * Add pan and zoom functionality to any element
- * Copyright (c) 2014 timmy willison
- * Released under the MIT license
- * https://github.com/timmywil/jquery.panzoom/blob/master/MIT-License.txt
- */
-!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],function(c){return b(a,c)}):"object"==typeof exports?b(a,require("jquery")):b(a,a.jQuery)}("undefined"!=typeof window?window:this,function(a,b){"use strict";function c(a,b){for(var c=a.length;--c;)if(+a[c]!==+b[c])return!1;return!0}function d(a){var c={range:!0,animate:!0};return"boolean"==typeof a?c.animate=a:b.extend(c,a),c}function e(a,c,d,e,f,g,h,i,j){this.elements="array"===b.type(a)?[+a[0],+a[2],+a[4],+a[1],+a[3],+a[5],0,0,1]:[a,c,d,e,f,g,h||0,i||0,j||1]}function f(a,b,c){this.elements=[a,b,c]}function g(a,c){if(!(this instanceof g))return new g(a,c);1!==a.nodeType&&b.error("Panzoom called on non-Element node"),b.contains(l,a)||b.error("Panzoom element must be attached to the document");var d=b.data(a,m);if(d)return d;this.options=c=b.extend({},g.defaults,c),this.elem=a;var e=this.$elem=b(a);this.$set=c.$set&&c.$set.length?c.$set:e,this.$doc=b(a.ownerDocument||l),this.$parent=e.parent(),this.isSVG=r.test(a.namespaceURI)&&"svg"!==a.nodeName.toLowerCase(),this.panning=!1,this._buildTransform(),this._transform=!this.isSVG&&b.cssProps.transform.replace(q,"-$1").toLowerCase(),this._buildTransition(),this.resetDimensions();var f=b(),h=this;b.each(["$zoomIn","$zoomOut","$zoomRange","$reset"],function(a,b){h[b]=c[b]||f}),this.enable(),b.data(a,m,this)}var h="over out down up move enter leave cancel".split(" "),i=b.extend({},b.event.mouseHooks),j={};if(a.PointerEvent)b.each(h,function(a,c){b.event.fixHooks[j[c]="pointer"+c]=i});else{var k=i.props;i.props=k.concat(["touches","changedTouches","targetTouches","altKey","ctrlKey","metaKey","shiftKey"]),i.filter=function(a,b){var c,d=k.length;if(!b.pageX&&b.touches&&(c=b.touches[0]))for(;d--;)a[k[d]]=c[k[d]];return a},b.each(h,function(a,c){if(2>a)j[c]="mouse"+c;else{var d="touch"+("down"===c?"start":"up"===c?"end":c);b.event.fixHooks[d]=i,j[c]=d+" mouse"+c}})}b.pointertouch=j;var l=a.document,m="__pz__",n=Array.prototype.slice,o=!!a.PointerEvent,p=function(){var a=l.createElement("input");return a.setAttribute("oninput","return"),"function"==typeof a.oninput}(),q=/([A-Z])/g,r=/^http:[\w\.\/]+svg$/,s=/^inline/,t="(\\-?[\\d\\.e]+)",u="\\,?\\s*",v=new RegExp("^matrix\\("+t+u+t+u+t+u+t+u+t+u+t+"\\)$");return e.prototype={x:function(a){var b=a instanceof f,c=this.elements,d=a.elements;return b&&3===d.length?new f(c[0]*d[0]+c[1]*d[1]+c[2]*d[2],c[3]*d[0]+c[4]*d[1]+c[5]*d[2],c[6]*d[0]+c[7]*d[1]+c[8]*d[2]):d.length===c.length?new e(c[0]*d[0]+c[1]*d[3]+c[2]*d[6],c[0]*d[1]+c[1]*d[4]+c[2]*d[7],c[0]*d[2]+c[1]*d[5]+c[2]*d[8],c[3]*d[0]+c[4]*d[3]+c[5]*d[6],c[3]*d[1]+c[4]*d[4]+c[5]*d[7],c[3]*d[2]+c[4]*d[5]+c[5]*d[8],c[6]*d[0]+c[7]*d[3]+c[8]*d[6],c[6]*d[1]+c[7]*d[4]+c[8]*d[7],c[6]*d[2]+c[7]*d[5]+c[8]*d[8]):!1},inverse:function(){var a=1/this.determinant(),b=this.elements;return new e(a*(b[8]*b[4]-b[7]*b[5]),a*-(b[8]*b[1]-b[7]*b[2]),a*(b[5]*b[1]-b[4]*b[2]),a*-(b[8]*b[3]-b[6]*b[5]),a*(b[8]*b[0]-b[6]*b[2]),a*-(b[5]*b[0]-b[3]*b[2]),a*(b[7]*b[3]-b[6]*b[4]),a*-(b[7]*b[0]-b[6]*b[1]),a*(b[4]*b[0]-b[3]*b[1]))},determinant:function(){var a=this.elements;return a[0]*(a[8]*a[4]-a[7]*a[5])-a[3]*(a[8]*a[1]-a[7]*a[2])+a[6]*(a[5]*a[1]-a[4]*a[2])}},f.prototype.e=e.prototype.e=function(a){return this.elements[a]},g.rmatrix=v,g.events=b.pointertouch,g.defaults={eventNamespace:".panzoom",transition:!0,cursor:"move",disablePan:!1,disableZoom:!1,increment:.3,minScale:.4,maxScale:5,rangeStep:.05,duration:200,easing:"ease-in-out",contain:!1},g.prototype={constructor:g,instance:function(){return this},enable:function(){this._initStyle(),this._bind(),this.disabled=!1},disable:function(){this.disabled=!0,this._resetStyle(),this._unbind()},isDisabled:function(){return this.disabled},destroy:function(){this.disable(),b.removeData(this.elem,m)},resetDimensions:function(){var a=this.$parent;this.container={width:a.innerWidth(),height:a.innerHeight()};var c,d=a.offset(),e=this.elem,f=this.$elem;this.isSVG?(c=e.getBoundingClientRect(),c={left:c.left-d.left,top:c.top-d.top,width:c.width,height:c.height,margin:{left:0,top:0}}):c={left:b.css(e,"left",!0)||0,top:b.css(e,"top",!0)||0,width:f.innerWidth(),height:f.innerHeight(),margin:{top:b.css(e,"marginTop",!0)||0,left:b.css(e,"marginLeft",!0)||0}},c.widthBorder=b.css(e,"borderLeftWidth",!0)+b.css(e,"borderRightWidth",!0)||0,c.heightBorder=b.css(e,"borderTopWidth",!0)+b.css(e,"borderBottomWidth",!0)||0,this.dimensions=c},reset:function(a){a=d(a);var b=this.setMatrix(this._origTransform,a);a.silent||this._trigger("reset",b)},resetZoom:function(a){a=d(a);var b=this.getMatrix(this._origTransform);a.dValue=b[3],this.zoom(b[0],a)},resetPan:function(a){var b=this.getMatrix(this._origTransform);this.pan(b[4],b[5],d(a))},setTransform:function(a){for(var c=this.isSVG?"attr":"style",d=this.$set,e=d.length;e--;)b[c](d[e],"transform",a)},getTransform:function(a){var c=this.$set,d=c[0];return a?this.setTransform(a):a=b[this.isSVG?"attr":"style"](d,"transform"),"none"===a||v.test(a)||this.setTransform(a=b.css(d,"transform")),a||"none"},getMatrix:function(a){var b=v.exec(a||this.getTransform());return b&&b.shift(),b||[1,0,0,1,0,0]},setMatrix:function(a,c){if(!this.disabled){c||(c={}),"string"==typeof a&&(a=this.getMatrix(a));var d,e,f,g,h,i,j,k,l,m,n=+a[0],o=this.$parent,p="undefined"!=typeof c.contain?c.contain:this.options.contain;return p&&(d=this._checkDims(),e=this.container,l=d.width+d.widthBorder,m=d.height+d.heightBorder,f=(l*Math.abs(n)-e.width)/2,g=(m*Math.abs(n)-e.height)/2,j=d.left+d.margin.left,k=d.top+d.margin.top,"invert"===p?(h=l>e.width?l-e.width:0,i=m>e.height?m-e.height:0,f+=(e.width-l)/2,g+=(e.height-m)/2,a[4]=Math.max(Math.min(a[4],f-j),-f-j-h),a[5]=Math.max(Math.min(a[5],g-k),-g-k-i+d.heightBorder)):(g+=d.heightBorder/2,h=e.width>l?e.width-l:0,i=e.height>m?e.height-m:0,"center"===o.css("textAlign")&&s.test(b.css(this.elem,"display"))?h=0:f=g=0,a[4]=Math.min(Math.max(a[4],f-j),-f-j+h),a[5]=Math.min(Math.max(a[5],g-k),-g-k+i))),"skip"!==c.animate&&this.transition(!c.animate),c.range&&this.$zoomRange.val(n),this.setTransform("matrix("+a.join(",")+")"),c.silent||this._trigger("change",a),a}},isPanning:function(){return this.panning},transition:function(a){if(this._transition)for(var c=a||!this.options.transition?"none":this._transition,d=this.$set,e=d.length;e--;)b.style(d[e],"transition")!==c&&b.style(d[e],"transition",c)},pan:function(a,b,c){if(!this.options.disablePan){c||(c={});var d=c.matrix;d||(d=this.getMatrix()),c.relative&&(a+=+d[4],b+=+d[5]),d[4]=a,d[5]=b,this.setMatrix(d,c),c.silent||this._trigger("pan",d[4],d[5])}},zoom:function(a,c){"object"==typeof a?(c=a,a=null):c||(c={});var d=b.extend({},this.options,c);if(!d.disableZoom){var g=!1,h=d.matrix||this.getMatrix();"number"!=typeof a&&(a=+h[0]+d.increment*(a?-1:1),g=!0),a>d.maxScale?a=d.maxScale:a<d.minScale&&(a=d.minScale);var i=d.focal;if(i&&!d.disablePan){var j=this._checkDims(),k=i.clientX,l=i.clientY;this.isSVG||(k-=(j.width+j.widthBorder)/2,l-=(j.height+j.heightBorder)/2);var m=new f(k,l,1),n=new e(h),o=this.parentOffset||this.$parent.offset(),p=new e(1,0,o.left-this.$doc.scrollLeft(),0,1,o.top-this.$doc.scrollTop()),q=n.inverse().x(p.inverse().x(m)),r=a/h[0];n=n.x(new e([r,0,0,r,0,0])),m=p.x(n.x(q)),h[4]=+h[4]+(k-m.e(0)),h[5]=+h[5]+(l-m.e(1))}h[0]=a,h[3]="number"==typeof d.dValue?d.dValue:a,this.setMatrix(h,{animate:"boolean"==typeof d.animate?d.animate:g,range:!d.noSetRange}),d.silent||this._trigger("zoom",h[0],d)}},option:function(a,c){var d;if(!a)return b.extend({},this.options);if("string"==typeof a){if(1===arguments.length)return void 0!==this.options[a]?this.options[a]:null;d={},d[a]=c}else d=a;this._setOptions(d)},_setOptions:function(a){b.each(a,b.proxy(function(a,c){switch(a){case"disablePan":this._resetStyle();case"$zoomIn":case"$zoomOut":case"$zoomRange":case"$reset":case"disableZoom":case"onStart":case"onChange":case"onZoom":case"onPan":case"onEnd":case"onReset":case"eventNamespace":this._unbind()}switch(this.options[a]=c,a){case"disablePan":this._initStyle();case"$zoomIn":case"$zoomOut":case"$zoomRange":case"$reset":this[a]=c;case"disableZoom":case"onStart":case"onChange":case"onZoom":case"onPan":case"onEnd":case"onReset":case"eventNamespace":this._bind();break;case"cursor":b.style(this.elem,"cursor",c);break;case"minScale":this.$zoomRange.attr("min",c);break;case"maxScale":this.$zoomRange.attr("max",c);break;case"rangeStep":this.$zoomRange.attr("step",c);break;case"startTransform":this._buildTransform();break;case"duration":case"easing":this._buildTransition();case"transition":this.transition();break;case"$set":c instanceof b&&c.length&&(this.$set=c,this._initStyle(),this._buildTransform())}},this))},_initStyle:function(){var a={"backface-visibility":"hidden","transform-origin":this.isSVG?"0 0":"50% 50%"};this.options.disablePan||(a.cursor=this.options.cursor),this.$set.css(a);var c=this.$parent;c.length&&!b.nodeName(c[0],"body")&&(a={overflow:"hidden"},"static"===c.css("position")&&(a.position="relative"),c.css(a))},_resetStyle:function(){this.$elem.css({cursor:"",transition:""}),this.$parent.css({overflow:"",position:""})},_bind:function(){var a=this,c=this.options,d=c.eventNamespace,e=o?"pointerdown"+d:"touchstart"+d+" mousedown"+d,f=o?"pointerup"+d:"touchend"+d+" click"+d,h={},i=this.$reset,j=this.$zoomRange;if(b.each(["Start","Change","Zoom","Pan","End","Reset"],function(){var a=c["on"+this];b.isFunction(a)&&(h["panzoom"+this.toLowerCase()+d]=a)}),c.disablePan&&c.disableZoom||(h[e]=function(b){var d;("touchstart"===b.type?!(d=b.touches)||(1!==d.length||c.disablePan)&&2!==d.length:c.disablePan||1!==b.which)||(b.preventDefault(),b.stopPropagation(),a._startMove(b,d))}),this.$elem.on(h),i.length&&i.on(f,function(b){b.preventDefault(),a.reset()}),j.length&&j.attr({step:c.rangeStep===g.defaults.rangeStep&&j.attr("step")||c.rangeStep,min:c.minScale,max:c.maxScale}).prop({value:this.getMatrix()[0]}),!c.disableZoom){var k=this.$zoomIn,l=this.$zoomOut;k.length&&l.length&&(k.on(f,function(b){b.preventDefault(),a.zoom()}),l.on(f,function(b){b.preventDefault(),a.zoom(!0)})),j.length&&(h={},h[(o?"pointerdown":"mousedown")+d]=function(){a.transition(!0)},h[(p?"input":"change")+d]=function(){a.zoom(+this.value,{noSetRange:!0})},j.on(h))}},_unbind:function(){this.$elem.add(this.$zoomIn).add(this.$zoomOut).add(this.$reset).off(this.options.eventNamespace)},_buildTransform:function(){return this._origTransform=this.getTransform(this.options.startTransform)},_buildTransition:function(){if(this._transform){var a=this.options;this._transition=this._transform+" "+a.duration+"ms "+a.easing}},_checkDims:function(){var a=this.dimensions;return a.width&&a.height||this.resetDimensions(),this.dimensions},_getDistance:function(a){var b=a[0],c=a[1];return Math.sqrt(Math.pow(Math.abs(c.clientX-b.clientX),2)+Math.pow(Math.abs(c.clientY-b.clientY),2))},_getMiddle:function(a){var b=a[0],c=a[1];return{clientX:(c.clientX-b.clientX)/2+b.clientX,clientY:(c.clientY-b.clientY)/2+b.clientY}},_trigger:function(a){"string"==typeof a&&(a="panzoom"+a),this.$elem.triggerHandler(a,[this].concat(n.call(arguments,1)))},_startMove:function(a,d){var e,f,g,h,i,j,k,m,n=this,p=this.options,q=p.eventNamespace,r=this.getMatrix(),s=r.slice(0),t=+s[4],u=+s[5],v={matrix:r,animate:"skip"};o?(f="pointermove",g="pointerup"):"touchstart"===a.type?(f="touchmove",g="touchend"):(f="mousemove",g="mouseup"),f+=q,g+=q,this.transition(!0),this.panning=!0,this._trigger("start",a,d),d&&2===d.length?(h=this._getDistance(d),i=+r[0],j=this._getMiddle(d),e=function(a){a.preventDefault();var b=n._getMiddle(d=a.touches),c=n._getDistance(d)-h;n.zoom(c*(p.increment/100)+i,{focal:b,matrix:r,animate:!1}),n.pan(+r[4]+b.clientX-j.clientX,+r[5]+b.clientY-j.clientY,v),j=b}):(k=a.pageX,m=a.pageY,e=function(a){a.preventDefault(),n.pan(t+a.pageX-k,u+a.pageY-m,v)}),b(l).off(q).on(f,e).on(g,function(a){a.preventDefault(),b(this).off(q),n.panning=!1,a.type="panzoomend",n._trigger(a,r,!c(r,s))})}},b.Panzoom=g,b.fn.panzoom=function(a){var c,d,e,f;return"string"==typeof a?(f=[],d=n.call(arguments,1),this.each(function(){c=b.data(this,m),c?"_"!==a.charAt(0)&&"function"==typeof(e=c[a])&&void 0!==(e=e.apply(c,d))&&f.push(e):f.push(void 0)}),f.length?1===f.length?f[0]:f:this):this.each(function(){new g(this,a)})},g});
\ No newline at end of file
diff --git a/documentation/4.1/api/lib/modernizr.custom.js b/documentation/4.1/api/lib/modernizr.custom.js
deleted file mode 100644
index 4688d63..0000000
--- a/documentation/4.1/api/lib/modernizr.custom.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Modernizr 2.5.3 (Custom Build) | MIT & BSD
- * Build: http://www.modernizr.com/download/#-inlinesvg
- */
-;window.Modernizr=function(a,b,c){function u(a){i.cssText=a}function v(a,b){return u(prefixes.join(a+";")+(b||""))}function w(a,b){return typeof a===b}function x(a,b){return!!~(""+a).indexOf(b)}function y(a,b,d){for(var e in a){var f=b[a[e]];if(f!==c)return d===!1?a[e]:w(f,"function")?f.bind(d||b):f}return!1}var d="2.5.3",e={},f=b.documentElement,g="modernizr",h=b.createElement(g),i=h.style,j,k={}.toString,l={svg:"http://www.w3.org/2000/svg"},m={},n={},o={},p=[],q=p.slice,r,s={}.hasOwnProperty,t;!w(s,"undefined")&&!w(s.call,"undefined")?t=function(a,b){return s.call(a,b)}:t=function(a,b){return b in a&&w(a.constructor.prototype[b],"undefined")},Function.prototype.bind||(Function.prototype.bind=function(b){var c=this;if(typeof c!="function")throw new TypeError;var d=q.call(arguments,1),e=function(){if(this instanceof e){var a=function(){};a.prototype=c.prototype;var f=new a,g=c.apply(f,d.concat(q.call(arguments)));return Object(g)===g?g:f}return c.apply(b,d.concat(q.call(arguments)))};return e}),m.inlinesvg=function(){var a=b.createElement("div");return a.innerHTML="<svg/>",(a.firstChild&&a.firstChild.namespaceURI)==l.svg};for(var z in m)t(m,z)&&(r=z.toLowerCase(),e[r]=m[z](),p.push((e[r]?"":"no-")+r));return u(""),h=j=null,e._version=d,e}(this,this.document);
\ No newline at end of file
diff --git a/documentation/4.1/api/lib/object_comp_annotation.svg b/documentation/4.1/api/lib/object_comp_annotation.svg
new file mode 100644
index 0000000..bccf6ca
--- /dev/null
+++ b/documentation/4.1/api/lib/object_comp_annotation.svg
@@ -0,0 +1,57 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="72px" height="72px" viewBox="0 0 72 72" version="1.1">
+  <defs>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-1">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <circle id="path-2" cx="32" cy="32" r="32"/>
+    <filter x="-50%" y="-50%" width="200%" height="200%" filterUnits="objectBoundingBox" id="filter-4">
+      <feOffset dx="0" dy="4" in="SourceAlpha" result="shadowOffsetOuter1"/>
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"/>
+      <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner1" result="shadowBlurInner1"/>
+      <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"/>
+      <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.14 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"/>
+      <feOffset dx="0" dy="-1" in="SourceAlpha" result="shadowOffsetInner2"/>
+      <feGaussianBlur stdDeviation="0" in="shadowOffsetInner2" result="shadowBlurInner2"/>
+      <feComposite in="shadowBlurInner2" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner2"/>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.14 0" in="shadowInnerInner2" type="matrix" result="shadowMatrixInner2"/>
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1"/>
+        <feMergeNode in="SourceGraphic"/>
+        <feMergeNode in="shadowMatrixInner1"/>
+        <feMergeNode in="shadowMatrixInner2"/>
+      </feMerge>
+    </filter>
+    <path id="path-5" d="M32 61C49.673112 61 64 48.0162577 64 32 64 15.9837423 49.673112 3 32 3 14.326888 3 0 15.9837423 0 32 0 48.0162577 14.326888 61 32 61Z"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Artboard-1" transform="translate(-298.000000, -91.000000)">
+      <g id="BG" transform="translate(302.000000, 91.000000)">
+        <g id="Icon">
+          <mask id="mask-3" fill="white">
+            <use xlink:href="#path-2"/>
+          </mask>
+          <use id="Mask" fill="#50CC93" filter="url(#filter-1)" xlink:href="#path-2"/>
+          <rect id="Rectangle-2" opacity="0.3" fill="#000000" mask="url(#mask-3)" x="-8" y="33" width="80" height="31"/>
+          <mask id="mask-6" fill="white">
+            <use xlink:href="#path-5"/>
+          </mask>
+          <use id="Mask" fill="#2C6C8D" filter="url(#filter-4)" xlink:href="#path-5"/>
+          <text id="t" mask="url(#mask-6)" font-family="Open Sans, Helvetica Neueu, Sans-serif" font-size="40" font-weight="normal" fill="#FFFFFF">
+            <tspan x="17" y="47">
+              O
+            </tspan>
+          </text>
+          <rect id="Rectangle-2" opacity="0.190065299" fill="#000000" mask="url(#mask-6)" x="-8" y="2" width="80" height="31"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/documentation/4.1/api/lib/open-sans-v13-latin-400i.eot b/documentation/4.1/api/lib/open-sans-v13-latin-400i.eot
new file mode 100644
index 0000000..81e597a
--- /dev/null
+++ b/documentation/4.1/api/lib/open-sans-v13-latin-400i.eot
diff --git a/documentation/4.1/api/lib/open-sans-v13-latin-400i.ttf b/documentation/4.1/api/lib/open-sans-v13-latin-400i.ttf
new file mode 100644
index 0000000..e6c5414
--- /dev/null
+++ b/documentation/4.1/api/lib/open-sans-v13-latin-400i.ttf
diff --git a/documentation/4.1/api/lib/open-sans-v13-latin-400i.woff b/documentation/4.1/api/lib/open-sans-v13-latin-400i.woff
new file mode 100644
index 0000000..c13ef91
--- /dev/null
+++ b/documentation/4.1/api/lib/open-sans-v13-latin-400i.woff
diff --git a/documentation/4.1/api/lib/open-sans-v13-latin-700.eot b/documentation/4.1/api/lib/open-sans-v13-latin-700.eot
new file mode 100644
index 0000000..748774f
--- /dev/null
+++ b/documentation/4.1/api/lib/open-sans-v13-latin-700.eot
diff --git a/documentation/4.1/api/lib/open-sans-v13-latin-700.ttf b/documentation/4.1/api/lib/open-sans-v13-latin-700.ttf
new file mode 100644
index 0000000..7b52945
--- /dev/null
+++ b/documentation/4.1/api/lib/open-sans-v13-latin-700.ttf
diff --git a/documentation/4.1/api/lib/open-sans-v13-latin-700.woff b/documentation/4.1/api/lib/open-sans-v13-latin-700.woff
new file mode 100644
index 0000000..ec478e5
--- /dev/null
+++ b/documentation/4.1/api/lib/open-sans-v13-latin-700.woff
diff --git a/documentation/4.1/api/lib/open-sans-v13-latin-700i.eot b/documentation/4.1/api/lib/open-sans-v13-latin-700i.eot
new file mode 100644
index 0000000..5dbb39a
--- /dev/null
+++ b/documentation/4.1/api/lib/open-sans-v13-latin-700i.eot
diff --git a/documentation/4.1/api/lib/open-sans-v13-latin-700i.ttf b/documentation/4.1/api/lib/open-sans-v13-latin-700i.ttf
new file mode 100644
index 0000000..a670e14
--- /dev/null
+++ b/documentation/4.1/api/lib/open-sans-v13-latin-700i.ttf
diff --git a/documentation/4.1/api/lib/open-sans-v13-latin-700i.woff b/documentation/4.1/api/lib/open-sans-v13-latin-700i.woff
new file mode 100644
index 0000000..808621a
--- /dev/null
+++ b/documentation/4.1/api/lib/open-sans-v13-latin-700i.woff
diff --git a/documentation/4.1/api/lib/template.css b/documentation/4.1/api/lib/template.css
index d5f89b1..1297447 100644
--- a/documentation/4.1/api/lib/template.css
+++ b/documentation/4.1/api/lib/template.css
@@ -244,6 +244,18 @@ span.symbol > a {
   background: url("package.svg") no-repeat center;
 }
 
+.big-circle.annotation {
+  background: url("annotation.svg") no-repeat center;
+}
+
+.big-circle.object-companion-annotation {
+  background: url("object_comp_annotation.svg") no-repeat center;
+}
+
+.big-circle.annotation-companion-object {
+  background: url("annotation_comp.svg") no-repeat center;
+}
+
 body.abstract.type div.big-circle {
   background: url("abstract_type.svg") no-repeat center;
 }
@@ -666,7 +678,7 @@ div#definition > h4#signature > span.modifier_kind > i.unfold-arrow,
 }
 
 .cmt code {
-  font-weight: bold;
+  font-family: "Source Code Pro", "Monaco", "Ubuntu Mono Regular", "Lucida Console", monospace;
 }
 
 .cmt a {
@@ -819,6 +831,38 @@ div.fullcomment dl.paramcmts > dd {
   min-height: 15px;
 }
 
+/* Author Content Table formatting */
+
+.doctbl {
+  border-collapse: collapse;
+  margin: 1.0em 0em;
+}
+
+.doctbl-left {
+  text-align: left;
+}
+
+.doctbl-center {
+  text-align: center;
+}
+
+.doctbl-right {
+  text-align: right;
+}
+
+table.doctbl th {
+  border: 1px dotted #364550;
+  background-color: #c2d2dc;
+  padding: 5px;
+  color: #103a51;
+  font-weight: bold;
+}
+
+table.doctbl td {
+  border: 1px dotted #364550;
+  padding: 5px;
+}
+
 /* Members filter tool */
 
 #memberfilter {
@@ -847,6 +891,19 @@ div.fullcomment dl.paramcmts > dd {
   font-family: "Open Sans";
 }
 
+#memberfilter > .input > input::-webkit-input-placeholder {
+  color: #fff;
+  opacity: 0.6;
+}
+#memberfilter > .input > input:-ms-input-placeholder {
+  color: #fff;
+  opacity: 0.6;
+}
+#memberfilter > .input > input::placeholder  {
+  color: #fff;
+  opacity: 0.6;
+}
+
 #memberfilter > .clear {
   display: none;
   position: absolute;
diff --git a/documentation/4.1/api/lib/template.js b/documentation/4.1/api/lib/template.js
index 64177a7..66d2b42 100644
--- a/documentation/4.1/api/lib/template.js
+++ b/documentation/4.1/api/lib/template.js
@@ -1,20 +1,7 @@
 // © 2009–2010 EPFL/LAMP
 // code by Gilles Dubochet with contributions by Pedro Furlanetto, Marcin Kubala and Felix Mulder
 
-var $panzoom = undefined;
 $(document).ready(function() {
-    // Add zoom functionality to type inheritance diagram
-    $panzoom = $(".diagram-container > .diagram").panzoom({
-        increment: 0.1,
-        minScale: 1,
-        maxScale: 7,
-        transition: true,
-        duration: 200,
-        contain: 'invert',
-        easing: "ease-in-out",
-        $zoomIn: $('#diagram-zoom-in'),
-        $zoomOut: $('#diagram-zoom-out'),
-    });
 
     var oldWidth = $("div#subpackage-spacer").width() + 1 + "px";
     $("div#packages > ul > li.current").click(function() {
@@ -259,7 +246,8 @@ $(document).ready(function() {
     };
 
     $("#template li[fullComment=yes]").click(function() {
-        commentToggleFct($(this));
+        var sel = window.getSelection().toString();
+        if (!sel) commentToggleFct($(this));
     });
 
     /* Linear super types and known subclasses */
@@ -270,18 +258,17 @@ $(document).ready(function() {
           if (!isMobile()) content.slideUp(100);
           else content.hide();
       } else {
+          // TODO: is there a cleaner way to render the svg only once it's visible?
+          setTimeout(function() {content.trigger('beforeShow');}, 100);
           if (!isMobile()) content.slideDown(100);
           else content.show();
       }
     };
 
-    $(".toggleContainer:not(.diagram-container):not(.full-signature-block)").click(function() {
-      toggleShowContentFct($(this));
-    });
-
-    $(".toggleContainer.full-signature-block").click(function() {
-      toggleShowContentFct($(this));
-      return false;
+    $(".toggle").click(function() {
+      toggleShowContentFct($(this).parent());
+      // Stop propagation so that we don't hide/show the parent (this a use case's full sig, which is nested in a member list)
+      if ($(this).parent().hasClass("full-signature-block")) return false;
     });
 
     if ($("#order > ol > li.group").length == 1) { orderGroup(); };
@@ -295,8 +282,10 @@ $(document).ready(function() {
     // highlight and jump to selected member if an anchor is provided
     if (window.location.hash) {
         var jqElem = findElementByHash(window.location.hash);
-        if (jqElem.length > 0)
-            exposeMember(jqElem);
+        if (jqElem.length > 0) {
+            if (jqElem.hasClass("toggleContainer")) toggleShowContentFct(jqElem);
+            else exposeMember(jqElem);
+        }
     }
 
     $("#template span.permalink").click(function(e) {