solving conflict
Merge branch 'master' of https://github.com/Thu-SaaS-CloudComputing/CloudComputing
push to heroku
Solve some conflicts in visitor_index_feature
Merge branch 'master' of https://github.com/Thu-SaaS-CloudComputing/CloudComputing
To get newest version. Not know why should be merged.
Merge branch 'master' of https://github.com/Thu-SaaS-CloudComputing/CloudComputing
Not knowing why this merge is necessary:
Merge branch 'fix/category-tree' of https://github.com/Thu-SaaS-CloudComputing/CloudComputing into fix/category-tree
Fix some errors in category-tree
Errors of category tree finished