Tested and finished Android tablet support
Merge branch 'feature'