Merge branch 'master' of bitbucket.org:colosa/processmaker

build.xml

@@ -2,7 +2,7 @@
 
 <project name="ProcessMaker Michelangelo" default="build-phpcs">
     <target name="build"
-        depends="prepare,lint,phploc,pdepend,phpcs-ci,phpunit,phpdox,behat"/>
+        depends="prepare,lint,phploc,phpcs-ci,phpunit,phpdox,behat"/>
 
     <target name="build-simple"
         depends="prepare,phpunit,phpcs-ci,phploc,lint"/>

features/bootstrap/RestContext.php

@@ -1643,7 +1643,7 @@ class RestContext extends BehatContext
         $this->printDebug("Exporting process to: $exportedProcessFileName");
 
         file_put_contents($exportedProcessFileName, $this->_response->getBody(true));
-
+        chmod($exportedProcessFileName, 0777);
 
 
     }

workflow/engine/controllers/pmTablesProxy.php

@@ -551,7 +551,7 @@ class pmTablesProxy extends HttpProxyController
 
         require_once $sPath . $this->className . '.php';
 
-        $rows = G::json_decode( stripslashes( $httpData->rows ) );
+        $rows = G::json_decode( $httpData->rows );
 
         if (is_array( $rows )) {
             foreach ($rows as $row) {

workflow/engine/skinEngine/neoclassic/css/style.css

@@ -3458,3 +3458,7 @@ button.x-btn-text:focus,
   /* Safari, Chrome */
 
 }
+
+.logo_company {
+    padding-left: 10px;
+}

workflow/engine/skinEngine/neoclassic/layout.html

@@ -12,7 +12,7 @@
           <table width="100%" height="32" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
             <tr>
                 {if $user_logged neq '' or $tracker neq ''}
-                <td width="50%" rowspan="2" valign="center"><img src="{$logo_company}"/></td>
+                <td width="50%" rowspan="2" valign="center"><img src="{$logo_company}" class="logo_company"/></td>
                 <td width="50%" height="16" align="right" valign="top">
                   <div align="right" class="logout">
                     <small>