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

* origin/tizen: (24 commits)
  PROJECTEMP : Merge mw branch.
  Merge remote-tracking branch 'origin/develop' into tizen
  PROJECTEMP : add autors and license and notice.
  PROJTEMP : Add default value of width/height.
  PROJECTEMP : update version update version.
  PROJECTEMP : Change setting of width in index.html. Change setting of width in index.html
  PROJECTEMP : Modify template.
  PROJECTEMP : change preview Image of Mobile 2048 Change preview Image.
  NSCREEN : modify description of template. Modify description of template.
  PROJECTEMP : update version
  PROJECTEMP : Modify template. Mobile2048 add cssfile.
  PROJECTEMP : Modify template Modify template
  PROJECTEMP : modify sample. Modify mobile sample.
  PROJECTEMP : add new template. add new template.
  Merge remote-tracking branch 'origin/tizen' into mw
  Merge remote-tracking branch 'origin/tizen' into mw
  Merge remote-tracking branch 'origin/develop' into tizen
  PROJECTEMP : Update version Update version info.
  PROJECTEMP : Modify page_managed_css_ver0_0_3.xslt Remove space character for URL path.
  PROJECTEMP : modify package namd and build script. Modify package name and build script.
  ...

Conflicts:
	templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
	templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
	templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
	templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml

Change-Id: Ia167ea1bf19d4c4a9562dffd63e40dcfee25b8d5
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/descriptors/Tizen-web-ui-fw/tizen.types.xml
index 953d976,f3d08c7..1a5ffd3
--- 1/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
--- 2/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
+++ b/templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
@@@ -830,4 -830,4 +830,5 @@@
                <constant value="text" displayName=""/>
                <constant value="attr" displayName="href"/>
        </type>
- </types>
+ </types>
++