Android: GUI beta
Android
Merge remote-tracking branch 'rainer/master'
Merge remote-tracking branch 'wenwen/master'