This file can house more configurations in one.

Modified add item form to set the data origin

Upload category

Profile now contains taxonomy field which can be any number of fixed categories
set across all items on import. This includes item type.

Conflicts:
	django/website/chn_spreadsheet/importer.py

Fixed dates on add/edit form to be 24-hour

On production server

Set USE_L10N to False so that we can override date/time settings in
settings.py

Location import

Password reset

This was causing test failures - not sure about actual database