#833

also modified a nose test to check that this works
Merge pull request #1263 from OCHA-DAP/continuous-browsing

Pull request for: #833
#1230
#1230
#1230
Merge pull request #1267 from OCHA-DAP/continuous-browsing

Continuous browsing
Merge pull request #1268 from OCHA-DAP/dev

Merge DEV to STAGING