[progress] update progress to 11
Merge branch 'develop' into cout
Merge branch 'develop' into cout
[progress] update progress to 20
Merge branch 'develop' into cout
Merge branch 'develop' into cout
Merge branch 'develop' into cout
[progress] update progress to 30
Merge branch 'develop' into cout
Merge branch 'develop' into cout
Merge branch 'cout' of gg:cbt-gem into cout
[progress] update progress to 40
Merge branch 'develop' into cout
[progress] update progress to 50
Merge branch 'develop' into cout
Merge branch 'develop' into cout
Merge branch 'cout' of gg:cbt-gem into cout
[complete] complete the branch by set progress to 99.
update gitignore for conflict.
Merge branch 'cout' into develop