Case #4169 - Added filtering by theme and location
Merge branch '7.x-2.x' of https://github.com/humanitarianresponse/hr_events into 7.x-2.x