Merge branch 'master' of https://gitlab.pacien.net/pacien/a3p-esieequest

Conflicts:
	website/index.html

1 files changed, 6 insertions, 3 deletions

diff --git a/website/index.html b/website/index.html
index ff95277..740ad6a 100644
--- a/website/index.html
+++ b/website/index.html
@@ -130,8 +130,11 @@
                                                                 <li>
                                                                         <a href="https://gitlab.pacien.net/pacien/a3p-esieequest"><i class="fa fa-coffee"></i> Source code</a>
                                                                 </li>
+                                                        <li>
+                                                                        <a href="/userdoc/"><i class="fa fa-clipboard"></i> Userdoc</a>
+                                                                </li>
                                                                 <li>
-                                                                        <a href="/javadoc/"><i class="fa fa-files-o"></i> Javadoc</a>
+                                                                        <a href="/progdoc/"><i class="fa fa-files-o"></i> Javadoc</a>
                                                                 </li>
                                                         </ul>
                                                 </div>
@@ -153,11 +156,11 @@
 
                 <div id="map" class="overbox fullscreen">
                         <iframe id="map-frame" src="map.svg">
-                                Your browser does not support iframes. Click <a href="map.svg" target="_blank">here</a> to open the map in a new window.
+                                Your browser does not support iframes.<br>Click <a href="map.svg" target="_blank">here</a> to open the map in a new window.
                         </iframe>
                 </div>
 
                 <script src="/assets/js/deployJava.js"></script>
                 <script src="/assets/js/script.js"></script>
         </body>
-</html>
+</html>
\ No newline at end of file