use #includes instead of counter cache, since counter cache with condition query has not been impliment in rails yet
Merge remote-tracking branch 'origin/master'