Merge branch 'master' into alex

merge

templates/corpus.html

@@ -127,8 +127,8 @@
 						<div class="jumbotron">
 						<h3><a href="/corpus/{{ corpus.id }}/explorer">Visualizations</a></h3>
 						<ol>
-								<li>Matrix</li>
-								<li>Static maps</li>
+								<li><a href="/corpus/{{ corpus.id }}/matrix">Adjacency matrix</a></li>
+								<li><a href="/corpus/{{ corpus.id }}/explorer">Static maps</a></li>
 								<li>Dynamics maps</li>
 						</ol>
 						</div>