Changes in AsyncableImageView
resolved conflicts
code cleaning and testing