Imported recent updates in Maneage, minor conflicts fixed

There were only three very small conflicts that have been fixed.

20 files changed, 21 insertions, 21 deletions

diff --git a/reproduce/software/bibtex/astrometrynet.tex b/reproduce/software/bibtex/astrometrynet.tex
index 1d1f032..15d4829 100644
--- a/reproduce/software/bibtex/astrometrynet.tex
+++ b/reproduce/software/bibtex/astrometrynet.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/astropy.tex b/reproduce/software/bibtex/astropy.tex
index 68fe5d4..c25803b 100644
--- a/reproduce/software/bibtex/astropy.tex
+++ b/reproduce/software/bibtex/astropy.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+%% Copyright (C) 2019-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/corner.tex b/reproduce/software/bibtex/corner.tex
index c4359d1..b2e0e25 100644
--- a/reproduce/software/bibtex/corner.tex
+++ b/reproduce/software/bibtex/corner.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+%% Copyright (C) 2019-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/cython.tex b/reproduce/software/bibtex/cython.tex
index 9ccf18b..88a5c4e 100644
--- a/reproduce/software/bibtex/cython.tex
+++ b/reproduce/software/bibtex/cython.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/fftw.tex b/reproduce/software/bibtex/fftw.tex
index 95cceec..7f525c9 100644
--- a/reproduce/software/bibtex/fftw.tex
+++ b/reproduce/software/bibtex/fftw.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+%% Copyright (C) 2019-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/galsim.tex b/reproduce/software/bibtex/galsim.tex
index b9d0b08..3646639 100644
--- a/reproduce/software/bibtex/galsim.tex
+++ b/reproduce/software/bibtex/galsim.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+%% Copyright (C) 2019-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/gnuastro.tex b/reproduce/software/bibtex/gnuastro.tex
index 98063be..1470a00 100644
--- a/reproduce/software/bibtex/gnuastro.tex
+++ b/reproduce/software/bibtex/gnuastro.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+%% Copyright (C) 2019-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/healpix.tex b/reproduce/software/bibtex/healpix.tex
index bae1acb..08bef90 100644
--- a/reproduce/software/bibtex/healpix.tex
+++ b/reproduce/software/bibtex/healpix.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+%% Copyright (C) 2019-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/imfit.tex b/reproduce/software/bibtex/imfit.tex
index 05fad0a..3822fd4 100644
--- a/reproduce/software/bibtex/imfit.tex
+++ b/reproduce/software/bibtex/imfit.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/matplotlib.tex b/reproduce/software/bibtex/matplotlib.tex
index a76a41f..c35f682 100644
--- a/reproduce/software/bibtex/matplotlib.tex
+++ b/reproduce/software/bibtex/matplotlib.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/missfits.tex b/reproduce/software/bibtex/missfits.tex
index bdb2879..9fb0f54 100644
--- a/reproduce/software/bibtex/missfits.tex
+++ b/reproduce/software/bibtex/missfits.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2020 Surena Fatemi <surena.fatemi@ipm.ir>
+%% Copyright (C) 2020-2021 Surena Fatemi <surena.fatemi@ipm.ir>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/mpi4py.tex b/reproduce/software/bibtex/mpi4py.tex
index a72d529..9a99803 100644
--- a/reproduce/software/bibtex/mpi4py.tex
+++ b/reproduce/software/bibtex/mpi4py.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/numpy.tex b/reproduce/software/bibtex/numpy.tex
index d0771bf..07101cf 100644
--- a/reproduce/software/bibtex/numpy.tex
+++ b/reproduce/software/bibtex/numpy.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/scamp.tex b/reproduce/software/bibtex/scamp.tex
index 52c8eb9..ab68dd6 100644
--- a/reproduce/software/bibtex/scamp.tex
+++ b/reproduce/software/bibtex/scamp.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/scipy.tex b/reproduce/software/bibtex/scipy.tex
index f2df5a3..71b0caa 100644
--- a/reproduce/software/bibtex/scipy.tex
+++ b/reproduce/software/bibtex/scipy.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/sextractor.tex b/reproduce/software/bibtex/sextractor.tex
index b9548a2..0c91a3d 100644
--- a/reproduce/software/bibtex/sextractor.tex
+++ b/reproduce/software/bibtex/sextractor.tex
@@ -1,5 +1,5 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
-%% Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/sip_tpv.tex b/reproduce/software/bibtex/sip_tpv.tex
index 26928f1..02dfec0 100644
--- a/reproduce/software/bibtex/sip_tpv.tex
+++ b/reproduce/software/bibtex/sip_tpv.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/swarp.tex b/reproduce/software/bibtex/swarp.tex
index d144a09..7636f1c 100644
--- a/reproduce/software/bibtex/swarp.tex
+++ b/reproduce/software/bibtex/swarp.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/sympy.tex b/reproduce/software/bibtex/sympy.tex
index fd4da56..1d07846 100644
--- a/reproduce/software/bibtex/sympy.tex
+++ b/reproduce/software/bibtex/sympy.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
+%% Copyright (C) 2019-2021 Raul Infante-Sainz <infantesainz@gmail.com>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright
diff --git a/reproduce/software/bibtex/tides.tex b/reproduce/software/bibtex/tides.tex
index 7b0b8e8..f3b5490 100644
--- a/reproduce/software/bibtex/tides.tex
+++ b/reproduce/software/bibtex/tides.tex
@@ -1,4 +1,4 @@
-%% Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+%% Copyright (C) 2019-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 %%
 %% Copying and distribution of this file, with or without modification,
 %% are permitted in any medium without royalty provided the copyright