fixed a small bug in ImageAdapter.java
Merge remote-tracking branch 'origin/master'