Merge branch 'development' into 'master'

Merge branch development into master

See merge request !42

requirements.txt

-numpy
-pandas
-matplotlib
-pyomo
-Shapely
-pycity_base>=0.3.1
+numpy==1.19.5
+pandas==1.1.5
+matplotlib==3.3.4
+pyomo==5.7.1
+Shapely==1.7.1
+pycity_base==0.3.2
 pylint
 sphinx
 numpydoc