Add layout attributes
Add one more ImageView to sample
Merge remote-tracking branch 'origin/master'