Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  PROJTEMP : Update index.managed.js.xslt for widget does not have id.
  PROJECTEP : bugfix for manged_css. Modify page_managed_css file.
  PROJTEMP : Update image descriptor.
  PROJTEMP : Update image widget descriptor.
  PROJTEMP : Add display style.
  PROJTEMP : Modify javascript for widget position.
  Merge remote-tracking branch 'origin/tizen' into develop
  PROJTEMP : Update "modifyStyle" function.
  Merge remote-tracking branch 'origin/nscreen' into develop

Conflicts:
	templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
	templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
	templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
	templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt

Change-Id: If2236261c8b68ed8b1f7b88b07519308e0980fa9
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

diff --cc templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
index ba9a78d,370d42b..d11745d
--- 1/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
--- 2/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
+++ b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
@@@ -111,4 -111,4 +111,4 @@@
                                </xsl:for-each>
                </xsl:for-each>
        </xsl:template>
--</xsl:stylesheet>
++</xsl:stylesheet>

diff --cc templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
index ba9a78d,370d42b..d11745d
--- 1/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
--- 2/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
+++ b/templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
@@@ -111,4 -111,4 +111,4 @@@
                                </xsl:for-each>
                </xsl:for-each>
        </xsl:template>
--</xsl:stylesheet>
++</xsl:stylesheet>

diff --cc templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
index ba9a78d,370d42b..d11745d
--- 1/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
--- 2/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
+++ b/templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
@@@ -111,4 -111,4 +111,4 @@@
                                </xsl:for-each>
                </xsl:for-each>
        </xsl:template>
--</xsl:stylesheet>
++</xsl:stylesheet>

diff --cc templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
index ba9a78d,370d42b..d11745d
--- 1/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
--- 2/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
+++ b/templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
@@@ -111,4 -111,4 +111,4 @@@
                                </xsl:for-each>
                </xsl:for-each>
        </xsl:template>
--</xsl:stylesheet>
++</xsl:stylesheet>