npe fixes and passing wrapper objects from one activity to another
merge remote-tracking branch 'origin/master'

* origin/master:
  Changed ImageView to ImageButton