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

* origin/develop:
  PROJECTEMP : modify ProjectTemplateContributor. Modify ProjectTemplateContributor.
  Merge remote-tracking branch 'origin/tizen' into develop
  PAGETEMP: Add Empty Page button is added in pages view toolbar. Add Empty Page Button is added in pages view toolbar. And Template delete Context Menu is added in template wizard.
  PAGETEMP: UI, UX complement Duplicate page name check, Default group name check, Default template check, Fixed wrong wizard link, Modified Browse button border, Fixed wrong wizard title and description, Applied page template indent.

Conflicts:
	package/changelog
	package/pkginfo.manifest

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

diff --cc org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
Simple merge