Merge "Changed buttons example to use ImageView." into devel/master