Merge branch 'excel_import' into datalayer

django/website/chn_spreadsheet/test_files/sample_excel.xlsx

django/website/chn_spreadsheet/tests.py

django/website/chn_spreadsheet/utils.py

django/website/hid/templates/hid/sources.html

django/website/hid/templates/hid/view.html

django/website/hid/urls.py

django/website/hid/views.py

django/website/media/images/favicon.ico

django/website/templates/base.html