Merge branch 'image_versioning' into develop

Change-Id: I533151ce04649fa2c9ea0af3ddc73234742ce296

diff --cc tizen/src/configuration.c
Simple merge

diff --cc tizen/src/fileio.c
index a7c3dac,feaa519..c0ffb87
mode 100755,100644..100755
--- 1/tizen/src/fileio.c
--- 2/tizen/src/fileio.c
+++ b/tizen/src/fileio.c

diff --cc tizen/src/fileio.h
index d3cd3cd,a0137c2..f989c6f
--- 1/tizen/src/fileio.h
--- 2/tizen/src/fileio.h
+++ b/tizen/src/fileio.h
@@@ -55,10 -55,9 +55,11 @@@
  #endif
  #include "process.h"
  #include "defines.h"
+ #include "utils.h"
  
  int is_exist_file(gchar *filepath);
 +gchar *get_sdk_root(void);
 +gchar *get_sdb_path(void);
  const gchar *get_exec_path(void);
  const gchar *get_root_path(void);
  const gchar *get_bin_path(void);

diff --cc tizen/src/menu_callback.c
Simple merge