renamed b21 to b22, created b2new
Merge branch 'branch2'