merged master
merged master

Signed-off-by: Evan Hazlett <7e61ed261aef9abaa71fd4c2127eb6cb9f01ce10@gmail.com>

bkcsoft/shipyard,LongTaiJun/DockerUI,zhiwei55/shipyard,chenrui2014/shipyard,LongTaiJun/DockerUI,rockzeng/shipyard,OnePaaS/shipyard,rchicoli/shipyard,chenrui2014/shipyard,linecheng/shipyard,zhoffice/shipyard,scapewang/shipyard,svdata/shipyard,dockerclubgroup/shipyard,ehazlett/shipyard,leroy-chen/shipyard,Dumbear/shipyard,RustJason/shipyard,scapewang/shipyard,tombee/shipyard,chenrui2014/shipyard,wujingke/shipyard,tombee/shipyard,Lev09/shipyard,iamjakob/shipyard,rbramwell/shipyard,daququ/shipyard,rockzeng/shipyard,pugna0/shipyard,rbramwell/shipyard,RustJason/shipyard,tombee/shipyard,chenrui2014/shipyard,bkcsoft/shipyard,swege/shipyard,OnePaaS/shipyard,ehazlett/shipyard,Lev09/shipyard,zhoffice/shipyard,eedevops/shipyard,eedevops/shipyard,leominov/shipyard,eedevops/shipyard,pugna0/shipyard,vanloswang/shipyard,rbramwell/shipyard,ehazlett/shipyard,leroy-chen/shipyard,Lev09/shipyard,tombee/shipyard,zhiwei55/shipyard,golang-lib/shipyard,golang-lib/shipyard,LongTaiJun/DockerUI,RustJason/shipyard,rockzeng/shipyard,bkcsoft/shipyard,zhoffice/shipyard,daququ/shipyard,rchicoli/shipyard,zhiwei55/shipyard,swege/shipyard,wujingke/shipyard,rockzeng/shipyard,iamjakob/shipyard,rbramwell/shipyard,OnePaaS/shipyard,Lev09/shipyard,wujingke/shipyard,vanloswang/shipyard,leominov/shipyard,linecheng/shipyard,daququ/shipyard,scapewang/shipyard,pugna0/shipyard,jsyinwenjun/shipyard,leroy-chen/shipyard,LongTaiJun/DockerUI,jsyinwenjun/shipyard,leroy-chen/shipyard,iamjakob/shipyard,Dumbear/shipyard,svdata/shipyard,wujingke/shipyard,pugna0/shipyard,jsyinwenjun/shipyard,eedevops/shipyard,dockerclubgroup/shipyard,linecheng/shipyard,beyondblog/shipyard,svdata/shipyard,ehazlett/shipyard,scapewang/shipyard,vanloswang/shipyard,leominov/shipyard,daququ/shipyard,zhiwei55/shipyard,swege/shipyard,John-Lin/shipyard,RustJason/shipyard,dockerclubgroup/shipyard,jsyinwenjun/shipyard,leominov/shipyard,beyondblog/shipyard,OnePaaS/shipyard,iamjakob/shipyard,beyondblog/shipyard,John-Lin/shipyard,Dumbear/shipyard,linecheng/shipyard,svdata/shipyard,vanloswang/shipyard,golang-lib/shipyard,rchicoli/shipyard,John-Lin/shipyard,golang-lib/shipyard,zhoffice/shipyard,rchicoli/shipyard,beyondblog/shipyard,John-Lin/shipyard,swege/shipyard,dockerclubgroup/shipyard,Dumbear/shipyard,bkcsoft/shipyard