Merge pull request #41 from g2-aj/branch_lin

Branch lin
Merge branch 'master' into branch_lin
Finished generate popular report