bump code version
Merge branch 'two-columns-layout'