update master
Merge branch 'master' of https://github.com/shalk/cloudview_deloy