readding sitemap
#1591 changes to nose test due to search controller refactoring
23
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan.git into dev
Merge pull request #1651 from OCHA-DAP/nose-test-changes

#1591 changes to nose test due to search controller refactoring
Merge pull request #1652 from OCHA-DAP/dan-test

Dan test
fixing nosetests
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan.git into dev
fixes #1517 - changed the icon position to append on the main menu items
Merge pull request #1654 from OCHA-DAP/arti-sprint-37

fixes #1517 - changed the icon position to append on the main menu items
Merge pull request #1655 from OCHA-DAP/dev

Merge DEV into STAG