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

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

Dev arti 30
hooking routes into new method
removing unneeded controller
controlling for old datasets {no indicator flag)
Merge pull request #1210 from OCHA-DAP/indicators

Indicators
#1200 - creating action/api that calls CPS rest api

- added configuration option for CPS url endpoint
- caching results
#1200 - changing action name
#1070
Merge pull request #1212 from OCHA-DAP/dev-selenium

#1070
Merge pull request #1213 from OCHA-DAP/rest-api

Rest api
Merge remote-tracking branch 'origin/dev' into dev-arti-30
#1202 - fix duplicate style loading