Merge "Install default-feedback-theme.json files in styles folder" into devel/master

diff --combined build/tizen/dali-toolkit/Makefile.am
index f31838e,29519f6..cfb5d18
--- 1/build/tizen/dali-toolkit/Makefile.am
--- 2/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@@ -23,6 -23,7 +23,7 @@@ public_api_src_dir  = ../../../dali-too
  devel_api_src_dir   = ../../../dali-toolkit/devel-api
  third_party_src_dir = ../../../dali-toolkit/third-party
  
+ toolkit_styles_base_dir = ${STYLE_BASE_DIR}
  toolkit_styles_dir = $(STYLE_DIR)
  toolkit_style_images_dir = $(STYLE_DIR)/images
  
@@@ -109,7 -110,7 +110,7 @@@ develapiprogressbardir =        $(devel
  develapishadowviewdir =         $(develapicontrolsdir)/shadow-view
  develapisuperblurviewdir =      $(develapicontrolsdir)/super-blur-view
  develapifocusmanagerdir =       $(develapidir)/focus-manager
 -develapiimageatlasdir =         $(develapidir)/image-atlas
 +develapiimageloaderdir =         $(develapidir)/image-loader
  develapiscriptingdir =          $(develapidir)/scripting
  develapishadereffectsdir =      $(develapidir)/shader-effects
  develapitransitioneffectsdir =  $(develapidir)/transition-effects
@@@ -126,7 -127,7 +127,7 @@@ develapibuilder_HEADERS =           $(d
  develapieffectsview_HEADERS =       $(devel_api_effects_view_header_files)
  develapifocusmanager_HEADERS =      $(devel_api_focus_manager_header_files)
  develapigaussianblurview_HEADERS =  $(devel_api_gaussian_blur_view_header_files)
 -develapiimageatlas_HEADERS =        $(devel_api_image_atlas_header_files)
 +develapiimageloader_HEADERS =       $(devel_api_image_loader_header_files)
  develapimagnifier_HEADERS =         $(devel_api_magnifier_header_files)
  develapipageturnview_HEADERS =      $(devel_api_page_turn_view_header_files)
  develapipopup_HEADERS =             $(devel_api_popup_header_files)