reorganizing all the templated into hdx_theme
removing old templates
Merge remote-tracking branch 'origin/consolidated-templates' into
dev-templates

Conflicts:
	ckanext-metadata_fields/ckanext/metadata_fields/templates/package/package_onepage.html
who.ini added?
fixing conflict
Merge pull request #1124 from OCHA-DAP/dev-templates

Dev templates
Merged Marianne's changes to templates