Merge branch 'dev' into 'master'

Weekly merge to Master See merge request !165

Merge branch 'dev' into 'master'
aa9515b5 · Eirik Steira · e510257e · 9782ffcf · e510257e · e510257e
Commit aa9515b5 authored 5 years ago by Eirik Steira
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
--- a/javadoc/index-files/index-1.html
+++ b/javadoc/index-files/index-1.html
--- a/javadoc/index-files/index-10.html
+++ b/javadoc/index-files/index-10.html
--- a/javadoc/index-files/index-11.html
+++ b/javadoc/index-files/index-11.html
--- a/javadoc/index-files/index-12.html
+++ b/javadoc/index-files/index-12.html
--- a/javadoc/index-files/index-13.html
+++ b/javadoc/index-files/index-13.html
--- a/javadoc/index-files/index-14.html
+++ b/javadoc/index-files/index-14.html
--- a/javadoc/index-files/index-15.html
+++ b/javadoc/index-files/index-15.html
--- a/javadoc/index-files/index-16.html
+++ b/javadoc/index-files/index-16.html
--- a/javadoc/index-files/index-17.html
+++ b/javadoc/index-files/index-17.html
--- a/javadoc/index-files/index-18.html
+++ b/javadoc/index-files/index-18.html
--- a/javadoc/index-files/index-2.html
+++ b/javadoc/index-files/index-2.html
--- a/javadoc/index-files/index-3.html
+++ b/javadoc/index-files/index-3.html
--- a/javadoc/index-files/index-4.html
+++ b/javadoc/index-files/index-4.html
--- a/javadoc/index-files/index-5.html
+++ b/javadoc/index-files/index-5.html
--- a/javadoc/index-files/index-6.html
+++ b/javadoc/index-files/index-6.html
--- a/javadoc/index-files/index-7.html
+++ b/javadoc/index-files/index-7.html
--- a/javadoc/index-files/index-8.html
+++ b/javadoc/index-files/index-8.html
--- a/javadoc/index-files/index-9.html
+++ b/javadoc/index-files/index-9.html
--- a/javadoc/index.html
+++ b/javadoc/index.html