#1577 - marking the country in dataset view with 'mx-country'
fixes - #1878 - Country page list - pagination space
fixes - #990 - Download button in preview looks different than the one in dataset view
                     - changed download button style + adapted style of edit button and data api button
                     - aligned set of buttons inside the container
loggin and resets by email
Merge pull request #1935 from OCHA-DAP/marianne-dev

loggin and resets by email
Merge pull request #1937 from OCHA-DAP/arti-sprint-42

#1862 - Colombia Page: adding data from datastores
Merge pull request #1940 from OCHA-DAP/arti-sprint-42

#1862 - Colombia Page: adding data from datastores
Merge pull request #1942 from OCHA-DAP/arti-sprint-42

Arti sprint 42
Merge pull request #1945 from OCHA-DAP/arti-sprint-42

#1658 - Ebola Static Page: Map
Merge pull request #1948 from OCHA-DAP/prod

Prod
reworking ckan password resets closes #1532 closes #416 closes #139 closes #1860
Merge branch 'dev' of https://github.com/OCHA-DAP/hdx-ckan into marianne-dev
Merge pull request #1955 from OCHA-DAP/marianne-dev

reworking ckan password resets closes #1532 closes #416 closes #139 clos...
Merge pull request #1959 from OCHA-DAP/arti-sprint-43

Arti sprint 43
Merge pull request #1960 from OCHA-DAP/selenium-related-changes

#1577 - marking the country in dataset view with 'mx-country'
fixes #1923
Merge pull request #1961 from OCHA-DAP/dev-dan-43

fixes #1923
close #1845
test merge
Merge pull request #1965 from OCHA-DAP/merge-marianne-dev

Merge marianne dev