merge
Merge branch 'master' of https://github.com/mebinum/realtrends
local changes
Merge branch 'master' of https://github.com/mebinum/realtrends
fixed bugs