Prepare further amendments
Merge branch 'master' of https://github.com/Thu-SaaS-CloudComputing/CloudComputing
This merge is used for preparing further amendments
Fix some error in view part