update
Merge branch 'development-master' of https://github.com/Jusliang/CloudComputingDev into development-master
merge fixed