Merge branch 'Rsa tizen_2.2' into tizen

Merge branch 'Rsa tizen_2.2' into tizen

Conflicts:
	packaging/osp-uifw.spec
	res/common/usr/share/osp/bitmaps/720x1280/00_popup_bg.#.png
	res/common/usr/share/osp/bitmaps/720x1280/default/00_contacts_button_focus.#.png
	res/common/usr/share/osp/bitmaps/720x1280/default/00_popup_bottom_bg.#.png
	src/app/FApp_CoordinateInfo.cpp
	src/app/FApp_ThemeInfo.cpp
	src/graphics/FGrp_BitmapImpl.cpp
	src/graphics/FGrp_FontRsrcManager.cpp
	src/graphics/opengl/FGrpEgl.cpp
	src/graphics/text/FGrp_TextTextCutLinkParser.cpp
	src/ui/FUi_Clipboard.cpp
	src/ui/FUi_Control.cpp
	src/ui/FUi_ControlManager.cpp
	src/ui/FUi_DataBinding.cpp
	src/ui/FUi_DimmingLayer.cpp
	src/ui/FUi_EcoreEvas.cpp
	src/ui/FUi_EflUiEventManager.cpp
	src/ui/FUi_FocusManagerImpl.cpp
	src/ui/FUi_ResourceManager.cpp
	src/ui/FUi_UiFocusEvent.cpp
	src/ui/FUi_UiTouchEvent.cpp
	src/ui/FUi_Window.cpp
	src/ui/animations/FUiAnim_Debug.cpp
	src/ui/animations/FUiAnim_EflLayer.cpp
	src/ui/controls/FUiCtrl_AnimationPresenter.cpp
	src/ui/controls/FUiCtrl_Button.cpp
	src/ui/controls/FUiCtrl_ButtonPresenter.cpp
	src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
	src/ui/controls/FUiCtrl_ColorPicker.cpp
	src/ui/controls/FUiCtrl_ContextMenuGridPresenter.cpp
	src/ui/controls/FUiCtrl_ContextMenuListPresenter.cpp
	src/ui/controls/FUiCtrl_DateTimeBar.cpp
	src/ui/controls/FUiCtrl_EditCopyPasteManager.cpp
	src/ui/controls/FUiCtrl_EditDate.cpp
	src/ui/controls/FUiCtrl_EditDatePresenter.cpp
	src/ui/controls/FUiCtrl_EditPresenter.cpp
	src/ui/controls/FUiCtrl_EditTime.cpp
	src/ui/controls/FUiCtrl_EditTimePresenter.cpp
	src/ui/controls/FUiCtrl_GroupContainerPresenter.cpp
	src/ui/controls/FUiCtrl_HeaderImpl.cpp
	src/ui/controls/FUiCtrl_Indicator.cpp
	src/ui/controls/FUiCtrl_ListViewImpl.cpp
	src/ui/controls/FUiCtrl_OptionMenu.cpp
	src/ui/controls/FUiCtrl_OptionMenuItem.cpp
	src/ui/controls/FUiCtrl_OptionMenuPresenter.cpp
	src/ui/controls/FUiCtrl_OverlayAgent.cpp
	src/ui/controls/FUiCtrl_OverlayPanelImpl.cpp
	src/ui/controls/FUiCtrl_SearchBar.cpp
	src/ui/controls/FUiCtrl_SearchBarPresenter.cpp
	src/ui/controls/FUiCtrl_Slider.cpp
	src/ui/controls/FUiCtrl_SliderPresenter.cpp
	src/ui/controls/FUiCtrl_SplitPanel.cpp
	src/ui/controls/FUiCtrl_Tab.cpp
	src/ui/controls/FUiCtrl_TabBarPresenter.cpp
	src/ui/controls/FUiCtrl_TableView.cpp
	src/ui/controls/FUiCtrl_TableViewItem.cpp
	src/ui/controls/FUiCtrl_TableViewPresenter.cpp
	src/ui/controls/FUiCtrl_TokenEditPresenter.cpp
	src/ui/controls/FUiCtrl_Toolbar.cpp
	src/ui/controls/FUiCtrl_ToolbarPresenter.cpp
	src/ui/inc/FUiAnim_EflLayer.h
	src/ui/inc/FUiCtrl_EditDatePresenter.h
	src/ui/inc/FUiCtrl_EditTimePresenter.h
	src/ui/inc/FUiCtrl_OverlayAgent.h
	src/ui/inc/FUiCtrl_ScrollPanelPresenter.h
	src/ui/inc/FUiCtrl_SearchBar.h
	src/ui/inc/FUiCtrl_SliderPresenter.h
	src/ui/inc/FUiCtrl_TableView.h
	src/ui/inc/FUiCtrl_TableViewItem.h
	src/ui/inc/FUiCtrl_TableViewPresenter.h
	src/ui/inc/FUi_Control.h
	src/ui/inc/FUi_FocusManagerImpl.h
	src/ui/inc/FUi_ResourceHeaderConfig.h
	src/ui/inc/FUi_ResourceManager.h
	src/ui/inc/FUi_ResourceOptionMenuConfig.h
	src/ui/inc/FUi_Window.h
	src/ui/resource/FUi_ResourceOptionMenuConfig.cpp

Change-Id: I4fbcc22563c8328af1bec99c95ca52ac0c94e976