Merge branch 'tizen_2.1' into tizen_2.2

Conflicts:
	src/ui/FUi_Control.cpp
	src/ui/FUi_EflUiEventManager.cpp
	src/ui/controls/FUiCtrl_Edit.cpp
	src/ui/inc/FUiCtrl_Edit.h

Change-Id: I2d6dfe0e3de1effaba9edfed2db466fa7f1d23be

diff --cc src/ui/FUi_EflUiEventManager.cpp
Simple merge

diff --cc src/ui/controls/FUiCtrl_Form.cpp
Simple merge

diff --cc src/ui/controls/FUiCtrl_Keypad.cpp
Simple merge

diff --cc src/ui/inc/FUiCtrl_Form.h
Simple merge