rework to 2 columns design
push AndroidManifest version
fix tests
remove modules/two-way-gridview as unused
Merge branch 'two-columns-layout'