merge changes from master

Author: skyhit

src/main/resources/sql/challenge-feeder/detail/get_registrants.sql

@@ -32,4 +32,4 @@ select
   and pcl.project_category_id = p.project_category_id
   and ar.coder_id = u.user_id
   and ar.algo_rating_type_id=3
-  and {filter}
+  and {filter}