Merge branch 'develop' into release

Conflicts:
	org.tizen.common.verrari/templates/jar/common-resources.jar
	org.tizen.common.verrari/templates/jar/jqm-common-resources.jar
	org.tizen.common.verrari/templates/jar/jqm-masterdetail.jar
	org.tizen.common.verrari/templates/jar/jqm-multipage.jar
	org.tizen.common.verrari/templates/jar/jqm-navigation.jar
	org.tizen.common.verrari/templates/jar/jqm-singlepage.jar
	org.tizen.common.verrari/templates/jar/tizen-basic.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-common-resources.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-masterdetail.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-multipage.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-navigation.jar
	org.tizen.common.verrari/templates/jar/tizenwebuifw-singlepage.jar

Change-Id: I67d543361a0814c4f764fb2ca550d22ce9396645

diff --cc org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java
Simple merge

diff --cc org.tizen.common.sign/src/org/tizen/common/sign/util/SigningProfileUtil.java
Simple merge

diff --cc org.tizen.common.verrari/test/src/org/tizen/common/verrari/template/FileTemplateTest.java
Simple merge

diff --cc org.tizen.common/src/org/tizen/common/util/HostUtil.java
index f9308bd,c6ae968..ddb494e
--- 1/org.tizen.common/src/org/tizen/common/util/HostUtil.java
--- 2/org.tizen.common/src/org/tizen/common/util/HostUtil.java
+++ b/org.tizen.common/src/org/tizen/common/util/HostUtil.java
@@@ -95,13 -95,13 +95,17 @@@ public abstract class HostUtil
          try {
              proc= runtime.exec(fullCommand);
              i = proc.waitFor();
-         } catch (IOException e) {
-             logger.warn( "Exception occurred: ", e );
+         } catch ( IOException e) {
+             logger.info( "Exception occurred:", e );
+             return false;
+         } catch (InterruptedException e)
+         {
+             logger.info( "Exception occurred:", e );
              return false;
 +        }
 +        catch (InterruptedException e)
 +        {
 +            logger.warn( "Exception occurred: ", e );
          } finally{
              logger.info( "HostUtil execute - exit value : {}", i );
              if(proc!=null)    

diff --cc org.tizen.common/src/org/tizen/common/util/PropertyUtil.java
index ac3d016,a829e13..004b89c
--- 1/org.tizen.common/src/org/tizen/common/util/PropertyUtil.java
--- 2/org.tizen.common/src/org/tizen/common/util/PropertyUtil.java
+++ b/org.tizen.common/src/org/tizen/common/util/PropertyUtil.java
@@@ -95,12 -101,12 +103,13 @@@ public abstract class PropertyUtil 
        public static boolean storeProperties(String fileName, Properties props) {
                BufferedWriter writer = null;
                
 -              try {
 +              try
 +              {
                        writer = new BufferedWriter(new FileWriter(fileName));
                        props.store(writer, null);
+                       return true;
                }
-               catch ( IOException e )
+               catch ( final IOException e )
                {
              logger.info( "Ignore exception" );
                        return false;

diff --cc org.tizen.common/test/src/org/tizen/common/util/ArrayUtilTest.java
index f19e942,965352f..5d78cee
--- 1/org.tizen.common/test/src/org/tizen/common/util/ArrayUtilTest.java
--- 2/org.tizen.common/test/src/org/tizen/common/util/ArrayUtilTest.java
+++ b/org.tizen.common/test/src/org/tizen/common/util/ArrayUtilTest.java
@@@ -617,13 -618,14 +617,14 @@@ public class ArrayUtilTes
          {
              LoggerFactory.getLogger( getClass() ).info( "Test case successfult" );
          }
-         
+ 
          for ( Object[] input : inputArray ) {
              for ( int i = -1 ; i < 10 ; i++ ) {
 -                for( int j = -1 ; j < 10 ; j++ ) {
 +                for( int j = i ; j < 10 ; j++ ) {
                      int deleteCount = 0;
+                     Object[] actualData = null;
                      try {
 -                        actualData = ArrayUtil.remove( input, i, j);
 +                        Object[] actualData = ArrayUtil.remove( input, i, j);
                          i = Math.max( 0, i );
                          if( j <= i) {
                              assertArrayEquals(input , actualData);