Merge branch 'develop' into feature/documentation

# Conflicts:
#	README.md
#	main/extra_func.py
#	main/forms.py
#	main/views.py

docs/source/conf.py

@@ -134,6 +134,7 @@ extensions = {
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.viewcode',
+    'sphinx.ext.napoleon',
     'sphinx_rtd_theme',
     'sphinx.ext.graphviz',
     'sphinx.ext.inheritance_diagram',
@@ -208,3 +209,5 @@ set_type_checking_flag = True
 typehints_fully_qualified = True
 always_document_param_types = True
 typehints_document_rtype = True
+
+napoleon_attr_annotations = True