Merge branch 'master' into tizen_2.1

Conflicts:
	demos/tizen-winsets/widgets/popupwindow/popupwindow.js

diff --cc demos/tizen-winsets/widgets/popupwindow/popupwindow.js
index a4fead0,0e33b0e..65232ce
--- 1/demos/tizen-winsets/widgets/popupwindow/popupwindow.js
--- 2/demos/tizen-winsets/widgets/popupwindow/popupwindow.js
+++ b/demos/tizen-winsets/widgets/popupwindow/popupwindow.js
@@@ -1,13 -1,6 +1,8 @@@
- $("#popupwindow-demo").bind("pageshow", function() {
-       $('#popupwindow-demo-transition-' + $("#popupContent2").popupwindow("option", "transition"))
-         .attr("checked", "true")
-         .checkboxradio("refresh");
- 
-       $(this).find('#progressbar').progressbar('start');
- });
- 
- $('input[name=popupwindow-demo-transition-choice]').bind("change", function(e) {
-       $("#popupContent2").popupwindow("option", "transition", $(this).attr("id").split("-").pop());
+ $( document ).one( "pageinit", "#popupwindow-demo", function () {
+       $("#btn_textbox_popup_cancel").on("vclick", function ( ev ) {
+               $("#textbox_popup").find("input").val("");
+               $("#textbox_popup").popup("close");
+       });
  });
 +
 +

diff --cc src/js/widgets/jquery.mobile.tizen.tokentextarea.js
index 0b1edd8,63d632e..63d632e
mode 100644,100755..100644
--- 1/src/js/widgets/jquery.mobile.tizen.tokentextarea.js
--- 2/src/js/widgets/jquery.mobile.tizen.tokentextarea.js
+++ b/src/js/widgets/jquery.mobile.tizen.tokentextarea.js