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