Map buttons
Merge branch 'master' of heroku.com:aiddata-china
Merge branch 'master' of heroku.com:aiddata-china
Kill sweeper
Merge branch 'master' of heroku.com:aiddata-china
escape plus in Scope#query_params