Merge branch 'master' of https://github.com/appirio-tech/tc-api into dev

Author: thabofletcher

queries/tc_direct_facts

@@ -31,17 +31,14 @@ WHERE ce.contest_id = p.project_id)
    AND r.round_type_id in (13,15,19,22,24,25)
    )  AS active_contests_count,
 
-    (select count (unique u.user_id)
+    (select count (unique rur.user_id)
   from resource rur
   	 , resource_info ri
      , project p
-     , user u
- where 1 =  1
-  and p.project_id = rur.project_id
+ where p.project_id = rur.project_id
   and rur.resource_id = ri.resource_id
   and rur.resource_role_id = 1
   and ri.resource_info_type_id = 1
-  and ri.value = u.user_id
   and p.project_status_id = 1) AS active_members_count, 
 
 (SELECT COUNT(*)