Merge pull request #89 from khoa-nd/master

Please pull the latest code
Merge pull request #90 from johnsonpham/master

fix bug for search page on the mobile version
Change the calculation process.
Merge remote-tracking branch 'origin/Release9' into Release9