normalize_row doesn't really need to dealw ith None
and theres a slightly more elegant way to calculate row numbers

Google CSV to XLSX conversion results in dates being stored as date objects
rather than strings, so we need to cope with these

Conflicts:
	django/website/templates/base.html

Resolved conflicts:
	django/website/local_settings.py.jenkins

...so that bootstrap building does not fail on syntax error anymore.

This eliminates warnings about the default value for this attribute
changing.

The default branch on staging was set to 'master'. This led to the
staging server not working because the wrong branch had been deployed.