Merge branch 'master' into easysetup

Change-Id: Iaa7111b7c0bdd2941d708247983bc8fc9bca8a5b
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>

diff --cc service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
index b11876e,ad34966..2cbd6e5
--- 1/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
--- 2/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
+++ b/service/easy-setup/sampleapp/mediator/android/EasySetup/app/src/main/java/org/iotivity/service/easysetup/MainActivity.java
@@@ -235,7 -235,14 +235,16 @@@ public class MainActivity extends Activ
              @Override\r
              public void onClick(View v) {\r
                  filePath = getFilesDir().getPath() + "/";\r
-                 isSecurityEnabled = true;\r
++
+                 if (isSecurityEnabled) {\r
+                     isSecurityEnabled = false;\r
+                     mEnableSecurity.setChecked(false);\r
+                 }\r
+                 else {\r
+                     isSecurityEnabled = true;\r
+                     mEnableSecurity.setChecked(true);\r
+                 }\r
++
                  //copy json when application runs first time\r
                  SharedPreferences wmbPreference = PreferenceManager.getDefaultSharedPreferences\r
                          (getApplicationContext());\r