interface update
android bitmaps from files
Merge remote-tracking branch 'origin/master' into unstable