Merge pull request #1216 from OCHA-DAP/dev-arti-30

Dev arti 30
#1204
Merge remote-tracking branch 'origin/dev' into dev-indicator-detail-dan
Merge pull request #1217 from OCHA-DAP/dev-arti-30

Dev arti 30
Merge pull request #1218 from OCHA-DAP/dev-arti-30

#1202 - fix indicator name to code mapping
Merge remote-tracking branch 'origin/dev' into dev-indicator-detail-dan 
#1204

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/public/header.css
Merge remote-tracking branch 'origin/dev' into dev-indicator-detail-dan
#1204
Merge pull request #1219 from OCHA-DAP/dev-indicator-detail-dan

Dev indicator detail dan
#1211 - fixing problems with CPS switch to HTTPS (and redirect )
also switching common config to point to our dataproxy
Merge pull request #1220 from OCHA-DAP/bug-fixes

Pull request for: #1211 - fixing problems with CPS switch to HTTPS (and redirect )
#1209
#1186
Merge pull request #1221 from OCHA-DAP/bug-fixes

PUll request for: #1209 #1186
Merge pull request #1223 from OCHA-DAP/dev-arti-30

#1202 - fix bad URL :)
Merge pull request #1229 from OCHA-DAP/dev-arti-30

Dev arti 30
Merge remote-tracking branch 'origin/dev' into dev-arti-30

Conflicts:
	ckanext-hdx_theme/ckanext/hdx_theme/templates/indicator/read.html
fixes #1227 - Indicator Detail Page (Amok): error not finding dotted.png
                    - fixes static resource referral from lite-main.css
                    - please do not move the lite-main.css file in the css directory