Merge pull request #554 from julceslauhub/master

Fix conflict with the USR_STATUS (editing profile) identifiers on the ExtJs script

workflow/engine/templates/users/users.js

@@ -1053,6 +1053,7 @@ function saveUser()
   var confPass = frmDetails.getForm().findField('USR_CNF_PASS').getValue();
 
   if (confPass === newPass) {
+    Ext.getCmp('USR_STATUS').setDisabled(readMode);
     Ext.getCmp('frmDetails').getForm().submit({
       url    : 'usersAjax',
       params : {