Merge branch 'master' into analysis_modular

.gitignore

makefile

src/__init__.py

src/adega/__init__.py

src/adega/settings.py

src/adega/static/adega/css/styles.css

src/adega/static/bootstrap4/css/bootstrap-grid.css

src/adega/static/bootstrap4/css/bootstrap-grid.css.map

src/adega/static/bootstrap4/css/bootstrap-grid.min.css

src/adega/static/bootstrap4/css/bootstrap-grid.min.css.map

src/adega/static/bootstrap4/css/bootstrap-reboot.css

src/adega/static/bootstrap4/css/bootstrap-reboot.css.map

src/adega/static/bootstrap4/css/bootstrap-reboot.min.css

src/adega/static/bootstrap4/css/bootstrap-reboot.min.css.map

src/adega/static/bootstrap4/css/bootstrap.css

src/adega/static/bootstrap4/css/bootstrap.css.map

src/adega/static/bootstrap4/css/bootstrap.min.css

src/adega/static/bootstrap4/css/bootstrap.min.css.map

src/adega/static/bootstrap4/js/bootstrap.bundle.js

src/adega/static/bootstrap4/js/bootstrap.bundle.js.map