[#176] Country filtering with improved performance
[#176] Merge branch 'develop' into feature/176_filter_performance

Conflicts:
	akvo/rsr/filters.py
Merge pull request #563 from akvo/feature/176_filter_performance

[#176] Country filtering with improved performance