Merge changes I17acf67f,If2410a4d into devel/master

* changes:
  Image class Usage Removal
  Remove ResourceImage Usage

diff --cc dali-toolkit/internal/controls/image-view/image-view-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
Simple merge

diff --cc dali-toolkit/public-api/controls/control.h
Simple merge