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
Adding a setting for disabling email sending
Commenting functions, marking some as deprecated
Changing deprecated message
#1107 - Adding more mx-* css classes for selenium
for #1128
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into sample_ext
Merge pull request #1129 from OCHA-DAP/changes-for-selenium

Pull request: Adding a setting for disabling email sending
Merge pull request #1130 from OCHA-DAP/extension-analysis

Pull request for: Extension analysis
Merge pull request #1131 from OCHA-DAP/sample_ext

Sample ext
selenium test use this
Some lines were not commented out so ckan could not start the plugin.
#1132 - fixing issue with iframe trying to load non-secure content over
HTTP
Merge pull request #1133 from OCHA-DAP/problem-with-commented-code

Pull request: Some lines were not commented out so ckan could not start the plugin.
Merge pull request #1134 from OCHA-DAP/changes-for-ssl

Pull request for: Changes for ssl #1132