#1310
Merge pull request #1356 from OCHA-DAP/dev-search-nosetest

#1310
#1309 - add source mapping between indicator name and indicator source code
           - prepare parameter for new API call
Merge pull request #1357 from OCHA-DAP/arti-bugfixing

#1309 - add source mapping between indicator name and indicator source c...
#1309 - changed the API call to match the new CPS API
small fixes related topics and features
Merge pull request #1358 from OCHA-DAP/arti-bugfixing

#1309 - changed the API call to match the new CPS API
Merge pull request #1359 from OCHA-DAP/sprint-33-bugs-alex

small fixes related topics and features
Merge pull request #1360 from OCHA-DAP/dev

Merge DEV into STAG