formatting
Merge branch 'master' into beta
no bitmap reference in pure java (non-android) code
Merge branch 'master' into beta