Add file 6
Modified file 6
Add file 7
Merge branch 'siva/release' of github.com:lowyuefei/TestGit into siva/live