,,,
...
Merge branch 'master' into liang
...
finish machine storage page