Merge branch 'angularjs' into develop
增加admin页面
Merge branch 'develop' of github.com:dockercn/docker-bucket into develop
Merge branch 'angularjs' of github.com:dockercn/docker-bucket into angularjs
Merge branch 'develop' of github.com:dockercn/docker-bucket into develop
Merge branch 'develop' into angularjs