Merge "Adding Character Spacing" into devel/master

diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
Simple merge

diff --cc dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
Simple merge

diff --cc dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
Simple merge

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

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