Merge "Simple implementation of ImageView." into devel/master