Merge pull request #596 from chrox/master

various Android fix
mv columns and text align options to 'Layout' panel
update ignore file
make Android target