Add Android screenshot
Update demo info: add Android tablet.
Merge branch 'master' into gh-pages