Updated Copyright claims

- updated reference dates;
- removed reference to Community Edition;
- normalized logging using Clipperz.log[Warn|Error|Debug]

109 files changed, 1153 insertions, 1593 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/BookmarkletProcessor.js b/frontend/gamma/js/Clipperz/PM/BookmarkletProcessor.js
index 897beed..4818b76 100644
--- a/frontend/gamma/js/Clipperz/PM/BookmarkletProcessor.js
+++ b/frontend/gamma/js/Clipperz/PM/BookmarkletProcessor.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 /*
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 Clipperz.PM.BookmarkletProcessor = function(aConfiguration) {
         this._configuration = aConfiguration;
         
         this._editableFields = null;
         this._favicon = null;
         
         return this;
 }
 
 Clipperz.PM.BookmarkletProcessor.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Clipperz.PM.BookmarkletProcessor";
         },
 
         //-------------------------------------------------------------------------
 
         'configuration': function() {
                 return this._configuration;
         },
 
         //-------------------------------------------------------------------------
 
         'pageTitle': function() {
                 return this.configuration().page.title;
         },
 
         //-------------------------------------------------------------------------
 
         'fields': function() {
                 return this.configuration().form.inputs;
         },
 
         //-------------------------------------------------------------------------
 
         'editableFields': function() {
                 if (this._editableFields == null) {
                         this._editableFields = MochiKit.Base.filter(function(aField) {
                                 var result;
                                 var type;
                 
diff --git a/frontend/gamma/js/Clipperz/PM/Connection.js b/frontend/gamma/js/Clipperz/PM/Connection.js
index a05a310..6a8f15e 100644
--- a/frontend/gamma/js/Clipperz/PM/Connection.js
+++ b/frontend/gamma/js/Clipperz/PM/Connection.js
@@ -1,137 +1,136 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 //-----------------------------------------------------------------------------
 //
         //      Abstract   C O N N E C T I O N   class
 //
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.Connection = function (args) {
         args = args || {};
 
         this._proxy = args.proxy || Clipperz.PM.Proxy.defaultProxy;
         this._getCredentialsFunction = args.getCredentialsFunction;
 
         this._clipperz_pm_crypto_version = null;
         this._connectionId = null;
         this._sharedSecret = null;
         this._serverLockValue = null;
 
         return this;
 }
 
 Clipperz.PM.Connection.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Connection [" + this.version() + "]";
         },
         
         //=========================================================================
 
         'version': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         'clipperz_pm_crypto_version': function() {
                 if (this._clipperz_pm_crypto_version == null) {
                         var connectionVersions;
                                 varversions;
                                 varversion;
                         var i, c;
 
                         version = null;
                         connectionVersions = Clipperz.PM.Connection.communicationProtocol.versions;
                         versions = MochiKit.Base.keys(connectionVersions);
                         c = versions.length;
                         for (i=0; i<c; i++) {
                                 if (! (versions[i] == 'current')) {
                                         if (this instanceof connectionVersions[versions[i]]) {
                                                 version = versions[i];
                                         };
                                 }
                         }
                         
                         this._clipperz_pm_crypto_version = version;
                 }
                 
                 return this._clipperz_pm_crypto_version;
         },
 
         //-------------------------------------------------------------------------
 
         'defaultErrorHandler': function(anErrorString, anException) {
-MochiKit.Logging.logError("### Connection.defaultErrorHandler: " + anErrorString + " (" + anException + ")");
+        //      Clipperz.logError("### Connection.defaultErrorHandler: " + anErrorString, anException);
+                Clipperz.logError("### Connection.defaultErrorHandler: " + anErrorString + " (" + anException + ")");
         },
         
         //-------------------------------------------------------------------------
 
         'getCredentialsFunction': function () {
                 return this._getCredentialsFunction;
         },
 
         'normalizedCredentials': function(someValues) {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         //=========================================================================
 
         'proxy': function () {
                 return this._proxy;
         },
 
         //=========================================================================
 
         'register': function () {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         'login': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'message': function(someArguments, aCallback) {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'serverSideUserCredentials': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //=========================================================================
 
         'sharedSecret': function () {
                 return this._sharedSecret;
         },
         
         'setSharedSecret': function (aValue) {
                 this._sharedSecret = aValue;
@@ -228,97 +227,96 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
                         ],
                                 'user':         MochiKit.Base.partial(MochiKit.Async.succeed, someUserData),
                                 'version':MochiKit.Base.partial(MochiKit.Async.succeed, Clipperz.PM.Connection.communicationProtocol.currentVersion),
                                 'message':MochiKit.Base.partial(MochiKit.Async.succeed, 'completeRegistration')
                 });
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addMethod(this.proxy(), 'registration');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
 
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'updateCredentials': function (aUsername, aPassphrase, someUserData) {
                         vardeferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("Connection.updateCredentials", {trace:false});
                 deferredResult.collectResults({
                         'credentials': [
                                 MochiKit.Base.method(this, 'normalizedCredentials', {username:aUsername, password:aPassphrase}),
                                 MochiKit.Base.bind(function(someCredentials) {
                                         var srpConnection;
                                         var result;
 
                                         srpConnection = new Clipperz.Crypto.SRP.Connection({ C:someCredentials['username'], P:someCredentials['password'], hash:this.hash() });
                                         result = srpConnection.serverSideCredentials();
                                         result['version'] = Clipperz.PM.Connection.communicationProtocol.currentVersion;
 
                                         return result;
                                 }, this)
                         ],
                                 'user':         MochiKit.Base.partial(MochiKit.Async.succeed, someUserData)
                 });
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addMethod(this, 'message', 'upgradeUserCredentials');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.callback();
                 
                 return deferredResult;
                 
         },
 
         //=========================================================================
 
         'redeemOneTimePassword': function (someParameters) {
-//console.log("Connections.redeemOneTimePassword", someParameters['username'], someParameters['password']);
 /*
         //=========================================================================
                         //LOGIN WITH PASSPHRASE, extracted from the TRUNK version (LoginPanel.js)
                 deferredResult.addCallback(function(anUsername, aOneTimePassword) {
                         var args;
                         
                         args = {
                                 'message': 'oneTimePassword',
                                 'version': Clipperz.PM.Crypto.communicationProtocol.currentVersion,
                                 'parameters': {
                                         'oneTimePasswordKey': Clipperz.PM.DataModel.OneTimePassword.computeKeyWithUsernameAndPassword(anUsername, aOneTimePassword),
                                         'oneTimePasswordKeyChecksum': Clipperz.PM.DataModel.OneTimePassword.computeKeyChecksumWithUsernameAndPassword(anUsername, aOneTimePassword)
                                 }
                         }
                         
                         return args;
                 }, anUsername, oneTimePassword);
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'OTP_login_loadingOTP');
                 deferredResult.addCallback(MochiKit.Base.method(Clipperz.PM.Proxy.defaultProxy, 'handshake'));
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'OTP_login_extractingPassphrase');
                 deferredResult.addCallback(function(aResult) {
                         return Clipperz.PM.Crypto.deferredDecrypt(oneTimePassword, aResult['data'], aResult['version']);
                 });
                 deferredResult.addCallback(function(aResult) {
                         return (new Clipperz.ByteArray().appendBase64String(aResult['passphrase'])).asString();
                 });
                 deferredResult.addMethod(this, 'doLoginWithUsernameAndPassphrase', anUsername),
 */
                 var args;
                 var normalizedOTP;
 
                 normalizedOTP = Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword(someParameters['password']);
 
                 args = {
                         'message': 'oneTimePassword',
                         'version': Clipperz.PM.Connection.communicationProtocol.currentVersion,
                         'parameters': {
                                         'oneTimePasswordKey':           Clipperz.PM.DataModel.OneTimePassword.computeKeyWithUsernameAndPassword(someParameters['username'], normalizedOTP),
                                         'oneTimePasswordKeyChecksum':Clipperz.PM.DataModel.OneTimePassword.computeKeyChecksumWithUsernameAndPassword(someParameters['username'], normalizedOTP)
                         }
                 }
 
                 return Clipperz.Async.callbacks("Connction.redeemOTP", [
                         MochiKit.Base.method(this.proxy(), 'handshake', args),
                         function(aResult) {
                                 return Clipperz.PM.Crypto.deferredDecrypt({
                                                 value:aResult['data'],
                                                 key:normalizedOTP,
@@ -408,148 +406,147 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
         //      TODO: ?????             
         //              if (this.oneTimePassword() != null) {
         ///     ??              result = this.user().oneTimePasswordManager().archiveOneTimePassword(this.oneTimePassword()));
         //              }
 
                         if ((isReconnecting == true) && (this.serverLockValue() != someParameters['lock'])) {
                                 throw Clipperz.PM.Connection.exception.StaleData;
                         } else {
                                 this.setServerLockValue(someParameters['lock']);
                         }
 
                         return someParameters;
                 }, this));
         //      deferredResult.addCallbackPass(MochiKit.Signal.signal, this, 'updatedProgressState', 'connection_loggedIn');
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
                 deferredResult.addCallback(MochiKit.Async.succeed, {result:"done"});
 
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'logout': function() {
                 return Clipperz.Async.callbacks("Connection.logout", [
                         MochiKit.Base.method(this, 'setSharedSecret'),
                         MochiKit.Base.method(this.proxy(), 'logout', {})
                 ], {trace:false});
         },
 
         //=========================================================================
 
         'ping': function () {
                         //TODO: ping the server in order to have a valid session
         },
 
         //=========================================================================
 
         'message': function(aMessageName, someParameters) {
                 var args;
                 var parameters;
 
                 parameters = someParameters || {};
                 if (typeof(parameters['user']) != 'undefined') {
                         parameters['user']['lock'] = this.serverLockValue();
                 }
 
-//console.log(">>> Connection.message", aMessageName, someParameters);
                 args = {
                         message: aMessageName,
                         srpSharedSecret: this.sharedSecret(),
         //              parameters: (someParameters || {})
                         parameters: parameters
                 }
 
                 return this.sendMessage(args);
         },
 
         //-------------------------------------------------------------------------
 
         'sendMessage': function(someArguments) {
                         vardeferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("Connection.sendMessage", {trace:false});
                 deferredResult.addMethod(this.proxy(), 'message', someArguments);
                 deferredResult.addCallback(MochiKit.Base.bind(function(res) {
                         if (typeof(res['lock']) != 'undefined') {
                                 this.setServerLockValue(res['lock']);
                         }
                         return res;
                 }, this));
 
                 deferredResult.addErrback(MochiKit.Base.method(this, 'messageExceptionHandler'), someArguments);
                 deferredResult.callback();
                 
                 return deferredResult
         },
         
         //-------------------------------------------------------------------------
 
         'messageExceptionHandler': function(anOriginalMessageArguments, anError) {
                 var result;
 
-console.log(">>> Connection.messageExceptionHandler", anError, anError.message);
+Clipperz.log(">>> Connection.messageExceptionHandler:  " + anError.message, anError);
                 if (anError instanceof MochiKit.Async.CancelledError) {
                         result = anError;
                 } else {
                                 if ((anError.message == 'Trying to communicate without an active connection')||
                                         (anError.message == 'No tollManager available for current session')     
                         ) {
                                 result = this.reestablishConnection(anOriginalMessageArguments);
                         } else if (anError.message == 'Session with stale data') {
                                 MochiKit.Signal.signal(this, 'EXCEPTION');
                         } else {
                                 result = anError;
                         }
                 }
-console.log("<<< Connection.messageExceptionHandler", anError)
-                
+Clipperz.log("<<< Connection.messageExceptionHandler")
+
                 return result;;
         },
         
         //=========================================================================
 
         'reestablishConnection': function(anOriginalMessageArguments) {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("Connection.reestablishConnection");
                 deferredResult.addMethod(this, 'reset');
                 deferredResult.addMethod(this, 'login', true);
                 deferredResult.addCallback(MochiKit.Base.bind(function(aMessage) {
                         aMessage['srpSharedSecret'] = this.sharedSecret();
                         return aMessage;
                 }, this), anOriginalMessageArguments);
                 deferredResult.addMethod(this, 'sendMessage');
                 deferredResult.addErrback(MochiKit.Signal.signal, this, 'EXCEPTION', null);
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'serverSideUserCredentials': function(aUsername, aPassword) {
                         varresult;
                         varnewSrpConnection;
                 var normalizedAttributes;
                 
                 normalizedAttributes = this.normalizedCredentials({username:aUsername, password:aPassword});
                 newSrpConnection = new Clipperz.Crypto.SRP.Connection({ C:normalizedAttributes['username'], P:normalizedAttributes['password'], hash:this.hash() });
                 result = newSrpConnection.serverSideCredentials();
                 result['version'] = this.clipperz_pm_crypto_version();
 
                 return result;
         },
 
         //=========================================================================
 
         'normalizedCredentials': function(someValues) {
                 var result;
 
                 result = {}
                 result['username'] = this.hash()(new Clipperz.ByteArray(someValues['username'])).toHexString().substring(2);
                 result['password'] = this.hash()(new Clipperz.ByteArray(someValues['password'] + someValues['username'])).toHexString().substring(2);
 
                 return result;
         },
diff --git a/frontend/gamma/js/Clipperz/PM/Crypto.js b/frontend/gamma/js/Clipperz/PM/Crypto.js
index 31fe349..cd10e33 100644
--- a/frontend/gamma/js/Clipperz/PM/Crypto.js
+++ b/frontend/gamma/js/Clipperz/PM/Crypto.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Crypto) == 'undefined') { Clipperz.PM.Crypto = {}; }
 
 Clipperz.PM.Crypto.VERSION = "0.2";
 Clipperz.PM.Crypto.NAME = "Clipperz.PM.Crypto";
 
 Clipperz.PM.Crypto.encryptingFunctions = {};
 
 MochiKit.Base.update(Clipperz.PM.Crypto, {
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
 /*
         'communicationProtocol': {
                 'currentVersion': '0.2',
                 'versions': {
                                 '0.1': Clipperz.PM.Connection.SRP['1.0'],//Clipperz.Crypto.SRP.versions['1.0'].Connection,
                                 '0.2': Clipperz.PM.Connection.SRP['1.1']//Clipperz.Crypto.SRP.versions['1.1'].Connection
                 },
                 'fallbackVersions': {
                                 'current':'0.1',
                                 '0.2':  '0.1',
                                 '0.1':  null
                 }
         },
 */
         //-------------------------------------------------------------------------
 
         'encryptingFunctions': {
                 'currentVersion': '0.3',
                 'versions': {
 
                 //#####################################################################
 
                         '0.1': {
@@ -129,331 +127,331 @@ MochiKit.Base.update(Clipperz.PM.Crypto, {
                                         var encryptedData;
                                 
                                         key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                         value = new Clipperz.ByteArray(Clipperz.Base.serializeJSON(aValue));
                                         dataToEncrypt = Clipperz.Crypto.SHA.sha_d256(value).appendBlock(value);
                                         encryptedData = Clipperz.Crypto.AES.encrypt(key, dataToEncrypt, aNonce);
                                         result = encryptedData.toBase64String();
                                 
                                         return result;
                                 },
 
                                 'deferredEncrypt': function(aKey, aValue, aNonce) {
                                         var deferredResult;
                                                 varkey, value;
                                         var dataToEncrypt;
         //                              var encryptedData;
                                 
                                         key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                         value = new Clipperz.ByteArray(Clipperz.Base.serializeJSON(aValue));
                                         dataToEncrypt = Clipperz.Crypto.SHA.sha_d256(value).appendBlock(value);
                                         
                                         deferredResult = new Clipperz.Async.Deferred("Crypto[0.2].deferredEncrypt")
                                         deferredResult.addCallback(Clipperz.Crypto.AES.deferredEncrypt, key, dataToEncrypt, aNonce);
                                         deferredResult.addCallback(function(aResult) {
                                                 return aResult.toBase64String();
                                         })
                                         deferredResult.callback();
                                         
                                         return deferredResult;
                                 },
                         
                                 'decrypt': function(aKey, aValue) {
                                         var result;
                                         
                                         if (aValue != null) {
                                                 var key, value;
                                                 var decryptedData;
                                                 var decryptedValue;
 
                                                 key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                                 value = new Clipperz.ByteArray().appendBase64String(aValue);
                                 
                                                 decryptedData = Clipperz.Crypto.AES.decrypt(key, value);
                                                 decryptedValue = decryptedData.split((256/8));
 
                                                 try {
                                                         result = Clipperz.Base.evalJSON(decryptedValue.asString());
                                                 } catch (exception) {
-                                                        MochiKit.Logging.logError("Error while decrypting data [1]");
+                                                        Clipperz.logError("Error while decrypting data [1]");
                                                         throw Clipperz.Crypto.Base.exception.CorruptedMessage;
                                                 }
                                         } else {
                                                 result = null;
                                         }
                                         
                                         return result;
                                 },
 
                                 'deferredDecrypt': function(aKey, aValue) {
                                         var result;
 
                                         if (aValue != null) {
                                                 var deferredResult;
                                                 var key, value;
         //                                      var decryptedData;
 
                                                 key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                                 value = new Clipperz.ByteArray().appendBase64String(aValue);
 
                                                 deferredResult = new Clipperz.Async.Deferred("Crypto.[0.2].deferredDecrypt");
                                                 deferredResult.addCallback(Clipperz.Crypto.AES.deferredDecrypt, key, value);
                                                 deferredResult.addCallback(function(aResult) {
                                                         var result;
                                                         var decryptedData;
 
                                                         decryptedData = aResult.split((256/8));
                                                         
                                                         try {
                                                                 result = Clipperz.Base.evalJSON(decryptedData.asString());
                                                         } catch (exception) {
-                                                                MochiKit.Logging.logError("Error while decrypting data [2]");
+                                                                Clipperz.logError("Error while decrypting data [2]");
                                                                 throw Clipperz.Crypto.Base.exception.CorruptedMessage;
                                                         }
 
                                                         return result;
                                                 })
                                                 deferredResult.callback();
                                                 
                                                 result = deferredResult;
                                         } else {
                                                 result = MochiKit.Async.succeed(null);
                                         }
                                         
                                         return result;
                                 },
                         
                                 'hash': Clipperz.Crypto.SHA.sha_d256,
                                 
                                 'deriveKey': function(aStringValue) {
                                                 varbyteData;
                                         var result;
                                         
                                         byteData = new Clipperz.ByteArray(aStringValue);
                                         result = Clipperz.Crypto.SHA.sha_d256(byteData);
                                         
                                         return result;
                                 }
                         },
 
                 //#####################################################################
 
                         '0.3': {
                                 'encrypt': function(aKey, aValue, aNonce) {
                                         var result;
                                                 varkey, value;
                                         var data;
                                         var dataToEncrypt;
                                         var encryptedData;
                                 
                                         key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                         value = Clipperz.Base.serializeJSON(aValue);
                                         data = new Clipperz.ByteArray(value);
                                         encryptedData = Clipperz.Crypto.AES.encrypt(key, data, aNonce);
                                         result = encryptedData.toBase64String();
                                 
                                         return result;
                                 },
                                 
                                 'deferredEncrypt': function(aKey, aValue, aNonce) {
                                         var deferredResult;
                                                 varkey, value;
                                         var data;
                                         var dataToEncrypt;
                                         var encryptedData;
                                 
                                         key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                         value = Clipperz.Base.serializeJSON(aValue);
                                         data = new Clipperz.ByteArray(value);
                                         
                                         deferredResult = new Clipperz.Async.Deferred("Crypto[0.3].deferredEncrypt")
                                         deferredResult.addCallback(Clipperz.Crypto.AES.deferredEncrypt, key, data, aNonce);
                                         deferredResult.addCallback(function(aResult) {
                                                 return aResult.toBase64String();
                                         })
                                         deferredResult.callback();
                                         
                                         return deferredResult;
                                 },
                         
                                 'decrypt': function(aKey, aValue) {
                                         var result;
                                         
                                         if (aValue != null) {
                                                 var key, value;
                                                 var decryptedData;
 
                                                 key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                                 value = new Clipperz.ByteArray().appendBase64String(aValue);
                                 
                                                 decryptedData = Clipperz.Crypto.AES.decrypt(key, value);
 
                                                 value = decryptedData.asString();
                                                 try {
                                                         result = Clipperz.Base.evalJSON(value);
                                                 } catch (exception) {
-                                                        MochiKit.Logging.logError("Error while decrypting data [3]");
+                                                        Clipperz.logError("Error while decrypting data [3]");
                                                         throw Clipperz.Crypto.Base.exception.CorruptedMessage;
                                                 }
                                         } else {
                                                 result = null;
                                         }
                                         
                                         return result;
                                 },
                         
                                 'deferredDecrypt': function(aKey, aValue) {
                                         var deferredResult;
                                         
                                         deferredResult = new Clipperz.Async.Deferred("Crypto[0.3].deferredDecrypt", {trace: false});
         //                              now = new Date;
                                         
                                         if (aValue != null) {
                                                 var key, value;
         //                                      var decryptedData;
 
                                                 key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                                 value = new Clipperz.ByteArray().appendBase64String(aValue);
 
                                                 deferredResult.addCallback(Clipperz.Crypto.AES.deferredDecrypt, key, value);
                                                 deferredResult.addCallback(MochiKit.Async.wait, 0.1);
                                                 deferredResult.addCallback(function(aResult) {
                                                         return aResult.asString();
                                                 });
                                                 deferredResult.addCallback(MochiKit.Async.wait, 0.1);
                                                 deferredResult.addCallback(Clipperz.Base.evalJSON);
                                                 deferredResult.addErrback(function(anError) {
-                                                        MochiKit.Logging.logError("Error while decrypting data [4]");
+                                                        Clipperz.logError("Error while decrypting data [4]");
                                                         throw Clipperz.Crypto.Base.exception.CorruptedMessage;
                                                 })
                                         } else {
                                                 deferredResult.addCallback(function() {
                                                         return null;
                                                 });
                                         }
                                         deferredResult.callback();
                                         
                                         return deferredResult;
                                 },
                                 
                                 'hash': Clipperz.Crypto.SHA.sha_d256,
 
                                 'deriveKey': function(aStringValue) {
                                                 varbyteData;
                                         var result;
                                         
                                         byteData = new Clipperz.ByteArray(aStringValue);
                                         result = Clipperz.Crypto.SHA.sha_d256(byteData);
                                         
                                         return result;
                                 }
 
                         },
 
                 //#####################################################################
 /*
                         '0.4': {
                                 'encrypt': function(aKey, aValue, aNonce) {
                                         var result;
                                                 varkey, value;
                                         var data;
                                         var dataToEncrypt;
                                         var encryptedData;
                                 
-//MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt");
+//Clipperz.logDebug(">>> [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt");
                                         key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
-//MochiKit.Logging.logDebug("--- [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt - 1");
+//Clipperz.logDebug("--- [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt - 1");
                                         value = Clipperz.Base.serializeJSON(aValue);
-//MochiKit.Logging.logDebug("--- [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt - 2");
+//Clipperz.logDebug("--- [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt - 2");
 / *
-//MochiKit.Logging.logDebug("--> encrypt.fullSize: " + value.length);
+//Clipperz.logDebug("--> encrypt.fullSize: " + value.length);
                                                 value = value.replace(/":{"label":"/g,  '":{l:"');
                                                 value = value.replace(/":{"key":"/g,    '":{k:"');
                                                 value = value.replace(/":{"notes":"/g,  '":{n:"');
                                                 value = value.replace(/":{"record":"/g,         '":{r:"');
                                                 value = value.replace(/", "label":"/g,  '",l:"');
                                                 value = value.replace(/", "favicon":"/g,'",f:"');
-//MochiKit.Logging.logDebug("<-- encrypt.compressed: " + value.length);
+//Clipperz.logDebug("<-- encrypt.compressed: " + value.length);
 * /
                                         data = new Clipperz.ByteArray(value);
-//MochiKit.Logging.logDebug("--- [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt - 3");
+//Clipperz.logDebug("--- [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt - 3");
                                         encryptedData = Clipperz.Crypto.AES.encrypt(key, data, aNonce);
-//MochiKit.Logging.logDebug("--- [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt - 4");
+//Clipperz.logDebug("--- [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt - 4");
                                         result = encryptedData.toBase64String();
-//MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt");
+//Clipperz.logDebug("<<< [" + (new Date()).valueOf() + "] Clipperz.PM.Crypto.versions[0.3].encrypt");
                                 
                                         return result;
                                 },
                         
                                 'decrypt': function(aKey, aValue) {
                                         var result;
                                         
                                         if (aValue != null) {
                                                 var key, value;
                                                 var decryptedData;
 
                                                 key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                                 value = new Clipperz.ByteArray().appendBase64String(aValue);
                                 
                                                 decryptedData = Clipperz.Crypto.AES.decrypt(key, value);
 
                                                 value = decryptedData.asString();
 / *
                                                         value = value.replace(/":{l:"/g,'":{"label":"');
                                                         value = value.replace(/":{k:"/g,'":{"key":"');
                                                         value = value.replace(/":{n:"/g,'":{"notes":"');
                                                         value = value.replace(/":{r:"/g,'":{"record":"');
                                                         value = value.replace(/",l:"/g,         '", "label":"');
                                                         value = value.replace(/",f:"/g,         '", "favicon":"');
 * /
                                                 try {
                                                         result = Clipperz.Base.evalJSON(value);
                                                 } catch (exception) {
-                                                        MochiKit.Logging.logError("Error while decrypting data");
+                                                        Clipperz.logError("Error while decrypting data");
                                                         throw Clipperz.Crypto.Base.exception.CorruptedMessage;
                                                 }
                                                 
                                                 
                                         } else {
                                                 result = null;
                                         }
                                         
                                         return result;
                                 },
                         
                                 'hash': Clipperz.Crypto.SHA.sha_d256
                         },
 */
                 //#####################################################################
                         __syntaxFix__: "syntax fix"
                 }
         },
         
         //-------------------------------------------------------------------------
         
         'encrypt': function(aKey, aValue, aVersion) {
                 return Clipperz.PM.Crypto.encryptingFunctions.versions[aVersion].encrypt(aKey, aValue);
         },
 
         'deferredEncrypt': function(someParameters) {
                 return Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters['version']].deferredEncrypt(someParameters['key'], someParameters['value']);
         },
 
         //.........................................................................
 
         'decrypt': function(aKey, aValue, aVersion) {
                 return Clipperz.PM.Crypto.encryptingFunctions.versions[aVersion].decrypt(aKey, aValue);
         },
 
         'deferredDecrypt': function(someParameters) {
                 return Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters['version']].deferredDecrypt(someParameters['key'], someParameters['value']);
         },
 
         //-------------------------------------------------------------------------
 
         'hash': function(aValue) {
                 return Clipperz.PM.Crypto.encryptingFunctions.versions[Clipperz.PM.Crypto.encryptingFunctions.currentVersion]['hash'](aValue);
         },
         
         //-------------------------------------------------------------------------
 
         'randomKey': function() {
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLogin.js b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLogin.js
index 8f8696d..507ee31 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLogin.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLogin.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.DataModel');
 
 Clipperz.PM.DataModel.DirectLogin = function(args) {
         args = args || {};
 
         Clipperz.PM.DataModel.DirectLogin.superclass.constructor.apply(this, arguments);
 
                 this._reference                                 =args.reference
                                                                                         ||Clipperz.PM.Crypto.randomKey();
                 this._record                                    =args.record
                                                                                         ||Clipperz.Base.exception.raise('MandatoryParameter');
 
                 this._retrieveIndexDataFunction         = args.retrieveIndexDataFunction
                                                                                         ||this.record().retrieveDirectLoginIndexDataFunction()
                                                                                         ||Clipperz.Base.exception.raise('MandatoryParameter');
                 this._setIndexDataFunction              = args.setIndexDataFunction
                                                                                         ||this.record().setDirectLoginIndexDataFunction()
                                                                                         ||Clipperz.Base.exception.raise('MandatoryParameter');
                 this._removeIndexDataFunction   =args.removeIndexDataFunction
                                                                                         ||this.record().removeDirectLoginIndexDataFunction()
                                                                                         ||Clipperz.Base.exception.raise('MandatoryParameter');
 
                 this._inputs            = null;
                 this._bindings          = null;
                 this._formValues        = null;
         
         //      this._inputsDeferredLock                = new MochiKit.Async.DeferredLock();
         //      this._bindingsDeferredLock              = new MochiKit.Async.DeferredLock();
         //      this._formValuesDeferredLock    = new MochiKit.Async.DeferredLock();
 
         this._transientState = null;
 
         this._isBrandNew = MochiKit.Base.isUndefinedOrNull(args.reference);
         
         this.record().addDirectLogin(this);
 
         return this;
 }
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
 
         'toString': function() {
                 return "DirectLogin (" + this.reference() + ")";
         },
 
@@ -284,97 +282,97 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
                                 varresult;
                         var type;
 
                         type = anInput['type'] || 'text';
                         result =  type.toLowerCase() == 'radio';
                         
                         return result;
                 }, inputs);
                 
                 if (radios.length > 0) {
                         var updatedRadios;
                         
                         updatedRadios = {};
                         MochiKit.Iter.forEach(radios, MochiKit.Base.bind(function(aRadio) {
                                         varradioConfiguration;
                                 
                                 radioConfiguration = updatedRadios[aRadio['name']];
                                 if (radioConfiguration == null) {
                                         radioConfiguration = {type:'radio', name:aRadio['name'], options:[]};
                                         updatedRadios[aRadio['name']] = radioConfiguration;
                                 }
                                 
         //TODO: remove the value: field and replace it with element.dom.value = <some value>
                                 radioConfiguration.options.push({value:aRadio['value'], checked:aRadio['checked']});
 
         //TODO: shoud remove the 'formValues' call, as it is now deferred
         //                      if ((aRadio['checked'] == true) && (this.formValues()[aRadio['name']] == null)) {
         //                              this.formValues()[aRadio['name']] = aRadio['value'];
         //                      }
                         }, this))
                         
                         updatedInputs = MochiKit.Base.concat(updatedInputs, MochiKit.Base.values(updatedRadios));
                 }
                 
                 delete result.inputs;
                 result.inputs = updatedInputs;
 
                 return result;
         },
 
         '_fixConfiguration': function (aConfiguration) {
                 var fixedConfiguration;
         //      var inputs;
         //      var bindings;
         //      var i,c;
 
                 fixedConfiguration = Clipperz.Base.deepClone(aConfiguration);
 
-//console.log("PROCESS CONFIGURATION", aConfiguration);
+//Clipperz.log("PROCESS CONFIGURATION", aConfiguration);
                 switch (aConfiguration['bookmarkletVersion']) {
                         case '0.1':
                                 fixedConfiguration['formData'] = this.fixFormDataFromBookmarkletVersion_0_1(aConfiguration['formData']);
                                 break;
                         case '0.2':
                                 fixedConfiguration['formData'] = aConfiguration['formData'];
                                 break;
                 }
 
         / *     
                 aConfiguration['_inputs'] = [];
                 c = formData['inputs'].length;
                 for (i=0; i<c; i++) {
                         aConfiguration['_inputs'].push(new Clipperz.PM.DataModel.DirectLoginInput(formData['inputs'][i]));
                 }
 * /
 / *
                 aConfiguration['_bindings'] = {};
                 if (aConfiguration['legacyBindingData'] == null) {
                         if (aConfiguration['bindingData'] != null) {
                                 var bindingKey;
 
                                 for (bindingKey in aConfiguration['bindingData']) {
                                         var newBinding;
                                         
                                         newBinding = new Clipperz.PM.DataModel.DirectLoginBinding(bindingKey, {fieldKey:aConfiguration['bindingData'][bindingKey]});
                                         aConfiguration['_bindings'][newBinding.key()] = newBinding;
                                 }
                         } else {
                                 var editableFields;
         
                                 editableFields = MochiKit.Base.filter(function(aField) {
                                         var result;
                                         var type;
 
                                         type = aField['type'].toLowerCase();
                                         result = ((type != 'hidden') && (type != 'submit') && (type != 'checkbox') && (type != 'radio') && (type != 'select'));
 
                                         return result;
                                 }, aConfiguration['_inputs']);
         
                                 MochiKit.Iter.forEach(editableFields, MochiKit.Base.bind(function(anEditableField) {
                                         var newBinding;
                                         
                                         newBinding = new Clipperz.PM.DataModel.DirectLoginBinding(anEditableField['name']);
                                         aConfiguration['_bindings'][newBinding.key()] = newBinding;
                                 }, this));
                         }
@@ -436,166 +434,161 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
         //-------------------------------------------------------------------------
 
         'resetObjectDataStore': function () {
                 this._objectDataStore.removeAllData();
                 this._objectDataStore = null;
         },
 */
         //=========================================================================
 
         'bookmarkletConfiguration': function () {
                 return Clipperz.Async.callbacks("DirectLogin.bookmarkletConfiguration", [
                         Clipperz.Async.collectResults("DirectLogin.bookmarkletConfiguration <inner results>", {
                                 'label': MochiKit.Base.method(this, 'label'),
                                 'configuration': MochiKit.Base.method(this, 'getValue', '')
                         }, {trace:false}),
                         function (someValues) {
                                 var result;
                                 
                                 if (someValues['configuration'] != null) {
                                                 varconfiguration;
 
                                         configuration = {
                                                 'page': {
                                                         'title': someValues['label']
                                                         //'favicon'
                                                         //      'url'
                                                 },
                                                         'form':         someValues['configuration']['formData'],
                                                         'version':someValues['configuration']['bookmarkletVersion']
                                         }
 
                                         result = Clipperz.Base.formatJSON(configuration);
                                 } else {
                                         result = '';
                                 }
                                 
                                 return result;
                         }
                 ], {trace:false});
 
         },
 
         //-------------------------------------------------------------------------
 
         'setBookmarkletConfiguration': function (aValue) {
                 var bookmarkletConfiguration;
 
                 bookmarkletConfiguration = Clipperz.PM.DataModel.DirectLogin.checkBookmarkletConfiguration(aValue);
-//console.log("BOOKMARKLET CONFIGURATION", bookmarkletConfiguration);
+
                 return Clipperz.Async.callbacks("DirectLogin.setBookmarkletConfiguration", [
                         MochiKit.Base.method(this, 'setValue', 'formData', bookmarkletConfiguration['form']),
-//function (aValue) { console.log("SET VALUE - formData", aValue); return aValue; },
                         MochiKit.Base.method(this, 'setValue', 'bookmarkletVersion', bookmarkletConfiguration['version']),
 
                         MochiKit.Base.method(this, 'favicon'),
                         Clipperz.Async.deferredIf("the favicon is not set", [
                         ], [
                                 MochiKit.Base.method(this, 'faviconUrlWithBookmarkletConfiguration', bookmarkletConfiguration),
                                 MochiKit.Base.method(this, 'setFavicon')
                         ]),
                         
                         MochiKit.Base.method(this, 'updateInputsAfterChangingBookmarkletConfiguration'),
                         MochiKit.Base.method(this, 'updateFormValuesAfterChangingBookmarkletConfiguration'),
                         MochiKit.Base.method(this, 'updateBindingsAfterChangingBookmarkletConfiguration'),
                         
                         MochiKit.Base.noop
                 ], {trace:false});
         },
 
         //=========================================================================
 
         'formAttributes': function () {
                 return this.getValue('formData.attributes');
         },
 
         //=========================================================================
 
         'inputs': function () {
                 return Clipperz.Async.callbacks("DirectLogin.inputs", [
                         Clipperz.Async.deferredIf("this._inputs is defined", [
                         ], [
                                 MochiKit.Base.method(this, 'updateInputsAfterChangingBookmarkletConfiguration')
                         ])
                 ], {trace:false}, this._inputs);
         },
 
         'setInputWithFormDataConfiguration': function (aFormDataConfiguration) {
                 this._inputs = {};
 
                 if (aFormDataConfiguration != null) {
                         MochiKit.Iter.forEach(aFormDataConfiguration['inputs'], MochiKit.Base.bind(function (anInputData) {
                                 var newInput;
                         
                                 newInput = new Clipperz.PM.DataModel.DirectLoginInput(anInputData);
                                 this._inputs[newInput.name()] = newInput;
                         }, this));
                 }
                 
                 return this._inputs;
         },
 
         'updateInputsAfterChangingBookmarkletConfiguration': function () {
                 return Clipperz.Async.callbacks("DirectLogin.updateInputsAfterChangingBookmarkletConfiguration", [
-        //              MochiKit.Base.method(this, 'getValue', ''),
-//function (aValue) { console.log("VALUE", aValue); return aValue },
                         MochiKit.Base.method(this, 'getValue', 'formData'),
-//function (aValue) { console.log("FORM DATA", aValue); return aValue },
                         MochiKit.Base.method(this, 'setInputWithFormDataConfiguration')
                 ], {trace:false});
         },
 
         //=========================================================================
 
         'inputValues': function () {
                 return Clipperz.Async.callbacks("DirectLogin.inputValues", [
                         MochiKit.Base.method(this, 'inputs'),
                         MochiKit.Base.values,
-        //function (aValue) { console.log("INPUTS", aValue); return aValue; },          
                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.partial(MochiKit.Base.method(this, 'inputValue'))),
                         Clipperz.Async.collectAll,
                         Clipperz.Base.mergeItems
                 ], {trace:false});
         },
 
         'inputValue': function (anInput) {
                         vardeferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("DirectLogin.inputValue", {trace:false});
 
                 if (anInput.needsFormValue()) {
                         deferredResult.addMethod(this, 'formValues');
                         deferredResult.addCallback(MochiKit.Base.itemgetter(anInput.name()));
                         deferredResult.addMethodcaller('value');
                 } else if (anInput.needsBinding()) {
                         deferredResult.addMethod(this, 'bindings');
                         deferredResult.addCallback(MochiKit.Base.itemgetter(anInput.name()));
                         deferredResult.addMethodcaller('field');
                         deferredResult.addMethodcaller('value');
                 } else {
                         deferredResult.addCallback(MochiKit.Async.succeed, anInput.value());
                 }
                 deferredResult.addCallback(function (anActualValue) {
                         return [anInput.name(), anActualValue];
                 });
 
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'bindings': function () {
                 return Clipperz.Async.callbacks("DirectLogin.bindings", [
                         Clipperz.Async.deferredIf("this._bindings is defined", [
                         ], [
                                 MochiKit.Base.method(this, 'updateBindingsAfterChangingBookmarkletConfiguration'),
                                 MochiKit.Base.bind(function () { return this._bindings;}, this)
                         ])
                 ], {trace:false}, this._bindings);
         },
 
         'bindFormFieldWithLabelToRecordFieldWithLabel': function (aFormFieldLabel, aRecordFieldLabel) {
                 return Clipperz.Async.callbacks("DirectLogin.bindFormFieldWithLabelToCardFieldWithLabel", [
                         Clipperz.Async.collectResults("DirectLogin.bindFormFieldWithLabelToCardFieldWithLabel - collect results", {
                                 'binding': [
@@ -629,109 +622,106 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
                                 
                                 result = {};
                                 for (bindingKey in someData['bindings']) {
                                         result[bindingKey] = someData['fieldValues'][someData['bindings'][bindingKey].fieldKey()]['value'];
                                 }
 
                                 return result;
                         }
                 ], {trace:false});
         },
 */
         //-------------------------------------------------------------------------
 
         'updateBindingsAfterChangingBookmarkletConfiguration': function () {
                 return Clipperz.Async.callbacks("DirectLogin.updateBindingsAfterChangingBookmarkletConfiguration", [
                         Clipperz.Async.collectResults("DirectLogin.updateBindingsAfterChangingBookmarkletConfiguration<collect results>", {
                                         'currentValues':MochiKit.Base.method(this, 'getValue', ''),
                                         'originalValues':MochiKit.Base.method(this, 'originalConfiguration'),
                                         'inputs':               MochiKit.Base.method(this, 'inputs')
                         }, {trace:false}),
                         MochiKit.Base.bind(function (someValues) {
                                 var availableBindingValues;
                                 var inputRequiringBindingValues;
                                 var newBindingValues;
 
                                 if (MochiKit.Base.isUndefinedOrNull(someValues['originalValues']) || MochiKit.Base.isUndefinedOrNull(someValues['originalValues']['bindingData'])) {
                                         availableBindingValues = {};
                                 } else {
                                         availableBindingValues = Clipperz.Base.deepClone(someValues['originalValues']['bindingData'])
                                 }
                                 
                                 if (someValues['currentValues'] != null) {
                                         MochiKit.Base.update(availableBindingValues, someValues['currentValues']['bindingData']);
                                 }
 
                                 this._bindings = {};
                                 newBindingValues = {}
                                 MochiKit.Iter.forEach(MochiKit.Base.filter(MochiKit.Base.methodcaller('needsBinding'), MochiKit.Base.values(someValues['inputs'])), MochiKit.Base.bind(function (anInput) {
                                                 varnewBinding;
                                         
                                         newBindingValues[anInput.name()] = availableBindingValues[anInput.name()];
                                         newBinding = new Clipperz.PM.DataModel.DirectLoginBinding(this, {
                                                         'key':  anInput.name(),
                                                         'field':availableBindingValues[anInput.name()]
                                         });
                                         
                                         this._bindings[anInput.name()] = newBinding;
                                 }, this))
-//console.log("THIS._BINDINGS", this._bindings);
 
                                 return newBindingValues;
 
 /*
                                 this._bindings = {};
-//console.log("CONFIGURATION", aConfiguration);
 
                                 if (someValues['currentValues'] != null) {
                                         if (someValues['currentValues']['bindingData'] != null) {
                                                 var bindingKey;
 
-//console.log("BINDING DATA", someValues['currentValues']['bindingData']);
                                                 for (bindingKey in someValues['currentValues']['bindingData']) {
                                                         var newBinding;
 
                                                         newBinding = new Clipperz.PM.DataModel.DirectLoginBinding(this, {
                                                                         'key':  bindingKey,
                                                                         'field':someValues['currentValues']['bindingData'][bindingKey]
                                                         });
                                                         this._bindings[newBinding.key()] = newBinding;
                                                 }
                                         } else  if (someValues['currentValues']['legacyBindingData'] == null) {
                                                 var bindingKey;
 
                                                 for (bindingKey in someValues['currentValues']['legacyBindingData']) {
                                                         var newBinding;
                 
                                                         newBinding = new Clipperz.PM.DataModel.DirectLoginBinding(this, {
                                                                         'key':  bindingKey, 
                                                                         'field':someValues['currentValues']['legacyBindingData'][bindingKey]
                                                         });
                                                         this._bindings[newBinding.key()] = newBinding;
                                                 }
                                         } else {
                                                 WTF = TODO;
                                         }
                                 }
 
                                 return this._bindings;
 */
                         }, this),
                         MochiKit.Base.method(this, 'setValue', 'bindingData')
                 ], {trace:false});
         },
 
         //=========================================================================
 
         'formValues': function () {
                 return Clipperz.Async.callbacks("DirectLogin.formValues", [
                         Clipperz.Async.deferredIf("this._formValues is defined", [
                         ], [
                                 MochiKit.Base.method(this, 'updateFormValuesAfterChangingBookmarkletConfiguration'),
                                 MochiKit.Base.bind(function () { return this._formValues;}, this)
                         ])
                 ], {trace:false}, this._formValues);
         },
 
         //-------------------------------------------------------------------------
 
         'updateFormValuesAfterChangingBookmarkletConfiguration': function () {
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginBinding.js b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginBinding.js
index 4377853..a8ebb97 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginBinding.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginBinding.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 
 //#############################################################################
 
 Clipperz.PM.DataModel.DirectLoginBinding = function(aDirectLogin, args) {
         args = args || {};
 
         this._directLogin = aDirectLogin|| Clipperz.Base.exception.raise('MandatoryParameter');
 
                 this._key =                     args.key|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._fieldKey =        args.field      || /* this.directLogin().fieldWithName(args.fieldName).reference()      ||      */null;
         
         return this;
 }
 
 Clipperz.PM.DataModel.DirectLoginBinding.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "DirectLoginBinding (" + this.key() + ", " + this.fieldKey() + ")";
         },
 
         //-------------------------------------------------------------------------
 
         'directLogin': function () {
                 return this._directLogin;
         },
 
         //-------------------------------------------------------------------------
 
         'key': function() {
                 return this._key;
         },
 
         //-------------------------------------------------------------------------
 
         'fieldKey': function() {
                 return this._fieldKey;
         },
         
         'setFieldKey': function(aValue) {
                 this._fieldKey = aValue;
                 
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginFormValue.js b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginFormValue.js
index a461197..2429f88 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginFormValue.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginFormValue.js
@@ -1,104 +1,101 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 
 //#############################################################################
 
 Clipperz.PM.DataModel.DirectLoginFormValue = function(aDirectLogin, args) {
         args = args || {};
 
         this._directLogin = aDirectLogin|| Clipperz.Base.exception.raise('MandatoryParameter');
 
                 this._key                       = args.key              || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._fieldOptions      = args.fieldOptions|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._value                     = args.value    || null;
         
         return this;
 }
 
 Clipperz.PM.DataModel.DirectLoginFormValue.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "DirectLoginFormValue (" + this.key() + ", " + this.value() + ")";
         },
 
         //-------------------------------------------------------------------------
 
         'directLogin': function () {
                 return this._directLogin;
         },
 
         //-------------------------------------------------------------------------
 
         'key': function() {
                 return this._key;
         },
 
         //-------------------------------------------------------------------------
 
         'fieldOptions': function() {
                 return this._fieldOptions;
         },
 
         //-------------------------------------------------------------------------
 
         'type': function () {
                 return this.fieldOptions()['type'];
         },
         
         //-------------------------------------------------------------------------
 
         'value': function() {
                         varresult;
                 
                 result = this._value;
                 
         //      if ((result == null) && (this.type() == 'checkbox')) {
         //              result = false;
         //      };
                 
                 return result;
         },
         
         'setValue': function (aValue) {
-//console.log("DirectLoginFormValue.setValue", aValue);
                 this._value = aValue;
                 return this.directLogin().setValue('formValues' + '.' + this.key(), aValue);
         },
 
         //-------------------------------------------------------------------------
 /*
         'serializedData': function() {
                 return this.value();
         },
 */
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
 
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginInput.js b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginInput.js
index 8188389..d9995fc 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginInput.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/DirectLoginInput.js
@@ -1,200 +1,192 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 //#############################################################################
 
 Clipperz.PM.DataModel.DirectLoginInput = function(args) {
         this._args = args;
         
         return this;
 }
 
 Clipperz.PM.DataModel.DirectLoginInput.prototype = MochiKit.Base.update(null, {
 
         'args': function() {
                 return this._args;
         },
         
         //-------------------------------------------------------------------------
 
         'name': function() {
                 return this.args()['name'];
         },
 
         //-------------------------------------------------------------------------
 
         'type': function() {
                 var result;
                 
                 result = this.args()['type'];
                 
                 if (result != null) {
                         result = result.toLowerCase();
                 }
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'options': function() {
                 return this.args()['options'];
         },
 
         //-------------------------------------------------------------------------
 
         'value': function() {
                 return this.args()['value'];
         },
         
         //-------------------------------------------------------------------------
         /*
         'formConfiguration': function(someFormValues, someBindings, someFields) {
                 var result;
-//console.log("### DirectLoginInput.formConfiguration", someFields);
+
                 if (this.shouldSetValue()) {
                         switch (this.type()) {
                                 case 'select':
                                         var currentValue;
                                         var options;
                                         
         //                              currentValue = this.directLogin()._configuration['formValues'][this.name()];
                                         currentValue = someFormValues[this.name()];
                                         options = this.args()['options'];
                                         
                                         result = MochiKit.DOM.SELECT({name:this.name()},
                                                 MochiKit.Base.map(function(anOption) {
                                                         var options;
                                                         
                                                         options = {value:anOption['value']};
                                                         if (currentValue == anOption['value']) {
                                                                 options.selected = true;
                                                         }
                                                         
                                                         return MochiKit.DOM.OPTION(options, anOption['label'])
                                                 }, options)
                                         )
                                         break;
                                 case 'checkbox':
                                         var options;
                                         
                                         options = {type:'checkbox', name: this.name()};
         //                              if (this.directLogin()._configuration['formValues'][this.name()] == true) {
                                         if (someFormValues[this.name()] == true) {
                                                 options['checked'] = true;
                                         };
 
                                         result = MochiKit.DOM.INPUT(options, null);
                                         break;
                                 case 'radio':
                                         var currentName;
                                         var currentValue;
                                         var options;
                                         
                                         currentName = this.name();
         //                              currentValue = this.directLogin()._configuration['formValues'][this.name()];
                                         currentValue = someFormValues[this.name()];
                                         options = this.args()['options'];
                                         
                                         result = MochiKit.DOM.DIV(null,
                                                 MochiKit.Base.map(function(anOption) {
                                                         var options;
                                                         var isChecked;
                                                         var inputNode;
                                                         var divNode;
                                                         
                                                         options = {type:'radio', name:currentName, value:anOption['value']}
                                                         isChecked = (currentValue == anOption['value']);
                                                         if (isChecked) {
                                                                 options.checked = true;
                                                         }
 
                                                         if (Clipperz_IEisBroken == true) {
                                                                 var checkedValue;
                                                                 
                                                                 checkedValue = (isChecked ? " CHECKED" : "");
                                                                 inputNode = MochiKit.DOM.currentDocument().createElement("<INPUT TYPE='RADIO' NAME='" + currentName + "' VALUE='" + anOption['value'] + "'" + checkedValue + ">");
                                                         } else {
                                                                 inputNode = MochiKit.DOM.INPUT(options, anOption['value']);
                                                         }
                                                         divNode = MochiKit.DOM.DIV(null, inputNode);
                                                         
                                                         return divNode;
                                                 }, options)
                                         );
                                         break;
                         }
                 } else {
                         var binding;
         //              binding = this.directLogin().bindings()[this.name()];
                         binding = someBindings[this.name()];
 
-//console.log("### binding", binding);
-//if (binding != null) {
-        ///console.log("    binding.field()", binding.field());
-        ///console.log("    binding.field().value()", binding.field().value());
-        //console.log("    someFields[binding.fieldKey()].value()", someFields[binding.fieldKey()].value());
-//}
                         result = MochiKit.DOM.INPUT({
                                 type:((this.type() != 'password') ? this.type() : 'text'),
                                 name:this.name(),
         //                      value:((binding != null)? binding.field().value() : this.value())
                                 value:((binding != null)? someFields[binding.fieldKey()]['value'] : this.value())
         //                      value:((binding != null)? someFields[binding.fieldKey()].value() : this.value())
                         }, null);
                 }
 
                 return result;
         },
         */
         //-------------------------------------------------------------------------
         
         'needsFormValue': function() {
                 var type;
                 var result;
 
                 type = this.type();
                 result = ((type == 'checkbox') || (type == 'radio') || (type == 'select'));
 
                 return result;
         },
 
         'needsBinding': function() {
                 var type;
                 var result;
 
                 type = this.type();
                 result = ((type == 'text') || (type == 'password'));
 
                 return result;
         },
         
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
 
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js b/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
index cdeec8b..1aa7a52 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 try { if (typeof(Clipperz.KeyValueObjectStore) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.PM.DataModel.EncryptedRemoteObject depends on Clipperz.KeyValueObjectStore!";
 }  
 
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 Clipperz.PM.DataModel.EncryptedRemoteObject = function(args) {
         args = args || {};
 
         this._name = args.name || null;
         this._reference = args.reference || Clipperz.PM.Crypto.randomKey();
         this._isBrandNew = ((args.reference == null) && (args.remoteData == null));
 
         if ((this._isBrandNew == false) && (args['retrieveKeyFunction'] == null)) {
                 Clipperz.Base.exception.raise('MandatoryParameter');
         } else {
                 this._retrieveKeyFunction = args['retrieveKeyFunction'];
         }
 
                 this._retrieveRemoteDataFunction        = args.retrieveRemoteDataFunction|| null;
                 this._remoteData                                        = args.remoteData                               || null;
         //      this._remoteData                                = args.remoteData ? Clipperz.Base.deepClone(args.remoteData) : null;
         if ((!this._isBrandNew) && ((this._retrieveRemoteDataFunction == null) && (this._remoteData == null))) {
                 Clipperz.Base.exception.raise('MandatoryParameter');
         }
 
 
                 this._encryptedDataKeypath                      = args.encryptedDataKeypath                     || 'data';      //Clipperz.Base.exception.raise('MandatoryParameter');
                 this._encryptedVersionKeypath           = args.encryptedVersionKeypath          || 'version';//Clipperz.Base.exception.raise('MandatoryParameter');
 
         
         this._transientState = null;
         this._deferredLocks = {};
 
         if (this._isBrandNew == true) {
                 this._objectDataStore = new Clipperz.KeyValueObjectStore(/*{'name':'EncryptedRemoteObject.objectDataStore [1]'}*/);
         } else {
                 this._objectDataStore = null;
         }
 
         return this;
 }
 
 //
@@ -366,100 +364,96 @@ Clipperz.PM.DataModel.EncryptedRemoteObject.prototype = MochiKit.Base.update(nul
         //-------------------------------------------------------------------------
 
         'getDeferredLockForKey': function (aKey) {
                 var result;
                 
                 result = this._deferredLocks[aKey];
                 
                 if (typeof(result) == 'undefined') {
                         result = new MochiKit.Async.DeferredLock();
                         this._deferredLocks[aKey] = result;
                 }
                 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
                 'unpackData': function (someData) {     //++
                 return someData;
         },
         
                 'packData': function (someData) {       //++
                 return someData;
         },
 
         //-------------------------------------------------------------------------
         
         'hasPendingChanges': function () {
                 var deferredResult;
                 var tempObj = this;
 
                 if (this.isBrandNew()) {
         //              deferredResult = MochiKit.Async.succeed(true);
                         deferredResult = this.hasPendingChangesWhenBrandNew();
                 } else if (this.hasInitiatedObjectDataStore()) {
                         deferredResult = new Clipperz.Async.Deferred("EncryptedRemoteObject.hasPendingChanges", {trace:false});
                         deferredResult.collectResults({
                                 'decryptedData': [
                                         MochiKit.Base.method(this, 'getDecryptedData'),
                                         Clipperz.Base.serializeJSON
                                 ],
                                 'objectData': [
                                         MochiKit.Base.method(this, '_getObjectDataStore'),
                                         MochiKit.Base.methodcaller('values'),
                                         Clipperz.Base.serializeJSON
                                 ]
                         });
                         deferredResult.addCallback(function (someValues) {
-//if (someValues['decryptedData'] != someValues['objectData']) {
-        //console.log("ORIGINAL DATA", '[[[' + someValues['decryptedData'] + ']]]');
-        //console.log("CURRENT  DATA", '>>>' + someValues['objectData'] + '<<<');
-//}
                                 return (someValues['decryptedData'] != someValues['objectData']);
                         });
                         deferredResult.callback();
                 } else {
                         deferredResult = MochiKit.Async.succeed(false);
                 }
 
                 return deferredResult;
         },
 
         'hasPendingChangesWhenBrandNew': function () {
                 return MochiKit.Async.succeed(true);
         },
 
         //-------------------------------------------------------------------------
 
         'commitTransientState': function () {
                 var deferredResult;
 
         //      if (this.transientState().getValue('__prepareRemoteData') == true) {
                 if (this.transientState().getValue('packedRemoteData') != null) {
                         deferredResult = Clipperz.Async.callbacks("EncryptedRemoteObject.commitTransientState - prepareRemoteData", [
                                 MochiKit.Base.bind(function (someData) {
                                         this._remoteData = this.transientState().getValue('packedRemoteData');
                                 }, this),
 
                                 MochiKit.Base.method(this, '_getObjectDataStore'),
                                 MochiKit.Base.methodcaller('values'),
                                 Clipperz.Base.deepClone,
                                 MochiKit.Base.method(this.decryptedDataStore(), 'setValue', 'decryptedData'),
 
                                 MochiKit.Base.method(this, 'resetTransientState', true)
                         ], {trace:false});
 
                 } else {
                         deferredResult = Clipperz.Async.callbacks("EncryptedRemoteObject.commitTransientState - NO prepareRemoteData", [
                                 MochiKit.Base.method(this, 'resetTransientState', true)
                         ], {trace:false});
                 }
                 
                 this._isBrandNew = false;
 
                 return deferredResult;
         },
         
         //-------------------------------------------------------------------------
 
         'revertChanges': function () {
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/OneTimePassword.js b/frontend/gamma/js/Clipperz/PM/DataModel/OneTimePassword.js
index 834e21b..fbca1ff 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/OneTimePassword.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/OneTimePassword.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 
 //#############################################################################
 
 Clipperz.PM.DataModel.OneTimePassword = function(args) {
         args = args || {};
 
         //this._user = args['user'];
                 this._reference                 = args['reference']|| Clipperz.PM.Crypto.randomKey();
                 this._password  = args['password'];
         this._passwordValue = Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword(args['password']);
                 this._creationDate      = args['created']       ? Clipperz.PM.Date.parseDateWithUTCFormat(args['created'])      : new Date();
                 this._usageDate                 = args['used']          ? Clipperz.PM.Date.parseDateWithUTCFormat(args['used'])                 : null;
                 
                 this._status            = args['status']        || 'ACTIVE';    //'REQUESTED', 'USED', 'DISABLED'
         this._connectionInfo= null;
         
                 this._key               = null;
                 this._keyChecksum= null;
 
         return this;
 }
 
 Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Clipperz.PM.DataModel.OneTimePassword";
         },
 /*
         //-------------------------------------------------------------------------
 
         'user': function() {
                 return this._user;
         },
 
         //-------------------------------------------------------------------------
 
         'password': function() {
                 return this._password;
         },
 
         //-------------------------------------------------------------------------
@@ -98,257 +96,255 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
         //-------------------------------------------------------------------------
 
         'keyChecksum': function() {
                 if (this._keyChecksum == null) {
                         this._keyChecksum = Clipperz.PM.DataModel.OneTimePassword.computeKeyChecksumWithUsernameAndPassword(this.user().username(), this.passwordValue());
                 }
                 
                 return this._keyChecksum;
         },
 */
         //-------------------------------------------------------------------------
 
         'status': function() {
                 return this._status;
         },
         
         'setStatus': function(aValue) {
                 this._status = aValue;
         },
         
         //-------------------------------------------------------------------------
 /*
         'serializedData': function() {
                 var result;
                 
                 result = {
                                 'password': this.password(),
                                 'created':              this.creationDate()             ? Clipperz.PM.Date.formatDateWithUTCFormat(this.creationDate())         : null,
                                 'used':                         this.usageDate()                ? Clipperz.PM.Date.formatDateWithUTCFormat(this.usageDate())    : null,
                                 'status':        this.status()
                 };
                 
                 return result;
         },
         
         //-------------------------------------------------------------------------
 
         'packedPassphrase': function() {
                 var result;
                 var packedPassphrase;
                 var encodedPassphrase;
                         varprefixPadding;
                 var suffixPadding;
                 var getRandomBytes;
                 
                 getRandomBytes = MochiKit.Base.method(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'getRandomBytes');
                 
                 encodedPassphrase = new Clipperz.ByteArray(this.user().passphrase()).toBase64String();
-//MochiKit.Logging.logDebug("--- encodedPassphrase.length: " + encodedPassphrase.length);
+//Clipperz.logDebug("--- encodedPassphrase.length: " + encodedPassphrase.length);
                 prefixPadding = getRandomBytes(getRandomBytes(1).byteAtIndex(0)).toBase64String();
-//MochiKit.Logging.logDebug("--- prefixPadding.length: " + prefixPadding.length);
+//Clipperz.logDebug("--- prefixPadding.length: " + prefixPadding.length);
                 suffixPadding = getRandomBytes((500 - prefixPadding.length - encodedPassphrase.length) * 6 / 8).toBase64String();
-//MochiKit.Logging.logDebug("--- suffixPadding.length: " + suffixPadding.length);
-//MochiKit.Logging.logDebug("--- total.length: " + (prefixPadding.length + encodedPassphrase.length + suffixPadding.length));
+//Clipperz.logDebug("--- suffixPadding.length: " + suffixPadding.length);
+//Clipperz.logDebug("--- total.length: " + (prefixPadding.length + encodedPassphrase.length + suffixPadding.length));
         
                 packedPassphrase = {
                         'prefix': prefixPadding,
                         'passphrase': encodedPassphrase,
                         'suffix': suffixPadding
                 };
                 
         //      result = Clipperz.Base.serializeJSON(packedPassphrase);
                 result = packedPassphrase;
-//MochiKit.Logging.logDebug("===== OTP packedPassprase: [" + result.length + "]" + result);
-//MochiKit.Logging.logDebug("<<< OneTimePassword.packedPassphrase");
+//Clipperz.logDebug("===== OTP packedPassprase: [" + result.length + "]" + result);
+//Clipperz.logDebug("<<< OneTimePassword.packedPassphrase");
 
                 return result;
         },
         
         //-------------------------------------------------------------------------
 
         'encryptedPackedPassphrase': function() {
                 return Clipperz.PM.Crypto.deferredEncryptWithCurrentVersion(this.passwordValue(), this.packedPassphrase())
         },
 
         //-------------------------------------------------------------------------
 
         'encryptedData': function() {
                 var deferredResult;
                         varresult;
 
-//MochiKit.Logging.logDebug(">>> OneTimePassword.encryptedData");
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - id: " + this.reference());
+//Clipperz.logDebug(">>> OneTimePassword.encryptedData");
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - id: " + this.reference());
                 result = {
                         'reference': this.reference(),
                         'key': this.key(),
                         'keyChecksum': this.keyChecksum(),
                         'data': "",
                         'version': Clipperz.PM.Crypto.encryptingFunctions.currentVersion
                 }
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 2: " + Clipperz.Base.serializeJSON(result));
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 2: " + Clipperz.Base.serializeJSON(result));
                 deferredResult = new MochiKit.Async.Deferred();
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 3");
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.encryptedData - 1: " + res); return res;});
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 3");
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.encryptedData - 1: " + res); return res;});
         //#     deferredResult.addCallback(Clipperz.PM.Crypto.deferredEncryptWithCurrentVersion, this.passwordValue(), this.packedPassphrase());
                 deferredResult.addCallback(MochiKit.Base.method(this, 'encryptedPackedPassphrase'));
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 4");
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.encryptedData - 2: [" + res.length + "]" + res); return res;});
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 4");
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.encryptedData - 2: [" + res.length + "]" + res); return res;});
                 deferredResult.addCallback(function(aResult, res) {
                         aResult['data'] = res;
                         return aResult;
                 }, result);
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 5");
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.encryptedData - 3: " + Clipperz.Base.serializeJSON(res)); return res;});
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 5");
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.encryptedData - 3: " + Clipperz.Base.serializeJSON(res)); return res;});
                 deferredResult.callback();
-//MochiKit.Logging.logDebug("--- OneTimePassword.encryptedData - 6");
+//Clipperz.logDebug("--- OneTimePassword.encryptedData - 6");
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'saveChanges': function() {
                 var deferredResult;
                         varresult;
 
-//MochiKit.Logging.logDebug(">>> OneTimePassword.saveChanges");
+//Clipperz.logDebug(">>> OneTimePassword.saveChanges");
                 result = {};
                 deferredResult = new MochiKit.Async.Deferred();
 
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveOTP_encryptUserData');
                 deferredResult.addCallback(MochiKit.Base.method(this.user(), 'encryptedData'));
                 deferredResult.addCallback(function(aResult, res) {
                         aResult['user'] = res;
                         return aResult;
                 }, result);
 
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveOTP_encryptOTPData');
                 deferredResult.addCallback(MochiKit.Base.method(this, 'encryptedData'));
                 deferredResult.addCallback(function(aResult, res) {
                         aResult['oneTimePassword'] = res;
                         return aResult;
                 }, result);
 
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveOTP_sendingData');
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.saveChanges - 1: " + Clipperz.Base.serializeJSON(res)); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.saveChanges - 1: " + Clipperz.Base.serializeJSON(res)); return res;});
                 deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'addNewOneTimePassword');
 
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveOTP_updatingInterface');
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.saveChanges - 2: " + res); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.saveChanges - 2: " + res); return res;});
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'notify', 'OTPUpdated');
                 deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'oneTimePassword_saveChanges_done', null);
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("OneTimePassword.saveChanges - 2: " + res); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("OneTimePassword.saveChanges - 2: " + res); return res;});
                 deferredResult.callback();
-//MochiKit.Logging.logDebug("<<< OneTimePassword.saveChanges");
+//Clipperz.logDebug("<<< OneTimePassword.saveChanges");
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'usageDate': function() {
                 return this._usageDate;
         },
 
         'setUsageDate': function(aValue) {
                 this._usageDate = aValue;
         },
 
         //-------------------------------------------------------------------------
 
         'connectionInfo': function() {
                 return this._connectionInfo;
         },
 
         'setConnectionInfo': function(aValue) {
                 this._connectionInfo = aValue;
         },
         
         //-------------------------------------------------------------------------
 
         'isExpired': function() {
                 return (this.usageDate() != null);
         },
 
         //-------------------------------------------------------------------------
 
         'updateStatusWithValues': function(someValues) {
                 var result;
 
                 result = false;
                 
                 if (someValues['status'] != this.status()) {
                         result = true;
                 }
                 
                 this.setStatus(someValues['status']);
                 this.setUsageDate(Clipperz.PM.Date.parseDateWithUTCFormat(someValues['requestDate']));
                 this.setConnectionInfo(someValues['connection']);
 
                 return result;
         },
         */
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
 
 //#############################################################################
 
 Clipperz.PM.DataModel.OneTimePassword.computeKeyWithUsernameAndPassword = function(anUsername, aPassword) {
         return Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aPassword)).toHexString().substring(2);
 }
 
 Clipperz.PM.DataModel.OneTimePassword.computeKeyChecksumWithUsernameAndPassword = function(anUsername, aPassword) {
         return Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(anUsername + aPassword)).toHexString().substring(2);
 }
 
 //=============================================================================
 
 Clipperz.PM.DataModel.OneTimePassword.isValidOneTimePasswordValue = function(aPassword) {
         var result;
         
         //"yaxx k7ww - f8y6 tqz5 - 58b6 th44 - 9cwv q0fg"
-//console.log("Clipperz.PM.DataModel.OneTimePassword.isValidOneTimePasswordValue", aPassword);
         if (aPassword.replace(/[\s\-]/g, '').length == 32) {
                 try {
                         var passwordByteArray;
                         
                         passwordByteArray = new Clipperz.ByteArray();
                         passwordByteArray.appendBase32String(aPassword);
                         
                         result = true;
                 } catch(exception) {
                         result = false;
                 }
         } else {
                 result = false;
         }
 
         return result;
 }
 
 //=============================================================================
 
 Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword = function(aPassword) {
                 varresult;
         
         if (aPassword.replace(/[\s\-]/g, '').length == 32) {
                 try {
                         var passwordByteArray;
                         
                         passwordByteArray = new Clipperz.ByteArray();
                         passwordByteArray.appendBase32String(aPassword);
                         
                         result = passwordByteArray.toBase64String();
                 } catch(exception) {
                         result = aPassword;
                 }
         } else {
                 result = aPassword;
         }
 
-//console.log("Clipperz.PM.DataModel.OneTimePassword.normalizedOneTimePassword", aPassword, result);
         return result;
 }
 
 //#############################################################################
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.Field.js b/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.Field.js
index f51bbc2..986db40 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.Field.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.Field.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 try { if (typeof(Clipperz.PM.DataModel.Record.Version) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.PM.DataModel.Record.Version.Field depends on Clipperz.PM.DataModel.Record.Version!";
 }  
 
 Clipperz.PM.DataModel.Record.Version.Field = function(args) {
         Clipperz.PM.DataModel.Record.Version.Field.superclass.constructor.apply(this, arguments);
 
                 this._recordVersion     = args.recordVersion|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._reference                 = args.reference        || Clipperz.PM.Crypto.randomKey();
 
         return this;
 }
 
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.Record.Version.Field, Object, {
 
         'toString': function() {
                 return "Record.Version.Field (" + this.reference() + ")";
         },
 
         //-------------------------------------------------------------------------
 
         'recordVersion': function () {
                 return this._recordVersion;
         },
 
         //-------------------------------------------------------------------------
 
         'reference': function () {
                 return this._reference;
         },
         
         //-------------------------------------------------------------------------
 
         'getItem': function (aKey) {
                 return Clipperz.Async.callbacks("Clipperz.PM.DataModel.Record.Version.Field.getItem", [
                         MochiKit.Base.method(this, 'recordVersion'),
                         MochiKit.Base.methodcaller('getValue', 'fields' + '.' + this.reference() + '.' + aKey)
                 ], {trace:false});
         },
 
         'setItem': function (aKey, aValue) {
                 return Clipperz.Async.callbacks("Clipperz.PM.DataModel.Record.Version.Field.getItem", [
                         MochiKit.Base.method(this, 'recordVersion'),
                         MochiKit.Base.methodcaller('setValue', 'fields' + '.' + this.reference() + '.' + aKey, aValue)
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.js b/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.js
index dd35fc9..87b319c 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/Record.Version.js
@@ -1,150 +1,146 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 try { if (typeof(Clipperz.PM.DataModel.Record) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.PM.DataModel.Record.Version depends on Clipperz.PM.DataModel.Record!";
 }  
 
 Clipperz.PM.DataModel.Record.Version = function(args) {
-//console.log(">>> Record.new");
         Clipperz.PM.DataModel.Record.Version.superclass.constructor.apply(this, arguments);
 
                 this._getVersionFunction = args.getVersion|| Clipperz.Base.exception.raise('MandatoryParameter');
         this._fields = null;
 
         return this;
 }
 
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.Record.Version, Clipperz.PM.DataModel.EncryptedRemoteObject, {
 
         'toString': function() {
                 return "Record.Version (" + this.reference() + ")";
         },
 
         //-------------------------------------------------------------------------
 
         'reference': function () {
                 return this._reference;
         },
         
         //-------------------------------------------------------------------------
 /*
         'hasPendingChanges': function () {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("Clipperz.PM.DataModel.Record.Version.hasPendingChanges", {trace:false});
                 deferredResult.addCallback(MochiKit.Base.bind(Clipperz.PM.DataModel.Record.Version.superclass.hasPendingChanges, this));
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 */
         //-------------------------------------------------------------------------
 
 
         'hasPendingChangesWhenBrandNew': function () {
                 var deferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("Clipperz.PM.DataModel.Record.Version.hasPendingChangesWhenBrandNew", {trace:false});
                 deferredResult.addMethod(this, 'fields');
                 deferredResult.addCallback(MochiKit.Base.values);
                 deferredResult.addCallback(MochiKit.Base.map, MochiKit.Base.methodcaller('isEmpty'))
                 deferredResult.addCallback(Clipperz.Async.collectAll);
                 deferredResult.addCallback(function(someValues) {
                         return MochiKit.Iter.every(someValues, MochiKit.Base.operator.identity);
                 });
                 deferredResult.addCallback(MochiKit.Base.operator.lognot)
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'commitTransientState': function () {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("Clipperz.PM.DataModel.Record.Version.commitTransientState", {trace:false});
                 deferredResult.addCallback(MochiKit.Base.bind(Clipperz.PM.DataModel.Record.Version.superclass.commitTransientState, this));
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //=========================================================================
 
                 'unpackData': function (someData) {     //++
                         varresult;
                 
-//console.log("Record.Version - UNPACK DATA", this, someData);
                 result = someData;
                 if ((someData['fields'] != null) && (someData['fields'] instanceof Array)) {
                                 varfields;
                         var i,c;
                         
                         fields = someData['fields'];
                         delete someData['fields'];
                         
                         someData['fields'] = {};
                         c = fields.length;
                         for (i=0; i<c; i++) {
                                 someData['fields'][i] = fields[i];
                         }
                 }
 
 
 
                 return result;
         },
 
         //=========================================================================
 
         'fields': function () {
                         vardeferredResult;
                 var deferredLock;
                 
                 deferredLock = this.getDeferredLockForKey('fields');
                 
                 deferredResult = new Clipperz.Async.Deferred("Record.Version.fields", {trace:false});
                 deferredResult.acquireLock(deferredLock);
                 deferredResult.addCallback(MochiKit.Base.bind(function () {
                         var innerDeferredResult;
 
                         if (this._fields == null) {
                                 innerDeferredResult = new Clipperz.Async.Deferred("Record.Version.fields <inner deferred>", {trace:false});
                                 innerDeferredResult.addMethod(this, 'getValue', 'fields');
                                 innerDeferredResult.addCallback(MochiKit.Base.bind(function (someObjectData) {
                                         var reference;
 
                                         this._fields = {};
                                         
                                         for (reference in someObjectData) {
                                                         varrecordVersionField;
                         
                                                 recordVersionField = new Clipperz.PM.DataModel.Record.Version.Field({
                                                                 'recordVersion':this,
                                                                 'reference':    reference
                                                 });
@@ -247,87 +243,86 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record.Version, Clipperz.PM.DataModel
 
         //=========================================================================
 
         'getVersionFunction': function () {
                 return this._getVersionFunction;
         },
         
         'previousVersion': function () {
                 return Clipperz.Async.callbacks("Record.Versions.previousVersion", [
                         MochiKit.Base.method(this, 'previousVersionReference'),
                         this.getVersionFunction()
                 ], {trace:false});
         },
 
         'previousVersionReference': function () {
                 return this.getValue('previousVersionReference');
         },
         
         'previousVersionKey': function () {
         //TODO: this value i encrypted on its own. So it can not be saved in the main objectStore!!!
                 return this.getValue('previousVersionKey');
         },
 
         //-------------------------------------------------------------------------
 
         'setPreviousVersionReferenceAndKey': function (aVersionObjectAndKey) {
         //      this._previousVersion = anotherVersion;
                 return Clipperz.Async.callbacks("Record.Version.setPreviousVersion", [
                                 MochiKit.Base.method(this, 'setValue', 'previousVersionReference',aVersionObjectAndKey['reference']),
                                 MochiKit.Base.method(this, 'setValue', 'previousVersionKey',    aVersionObjectAndKey['key'])
                 ], {trace:false});
         },
 
         //=========================================================================
 
         'revertChanges': function () {
                 this.setReference(this.transientState()['originalReference']);
                 Clipperz.PM.DataModel.Record.Version.superclass.revertChanges.apply(this, arguments);
         },
 
         //-------------------------------------------------------------------------
 
         'prepareRemoteDataWithKey': function (aKey) {
                 var deferredResult;
                 var result;
 
                 result = {};
 
-//console.log("prepareRemoteDataWithKey", aKey);
                 deferredResult = new Clipperz.Async.Deferred("Record.Version.prepareRemoteDataWithKey", {trace:false});
                 if (this.isBrandNew() == false) {
                         this.transientState()['originalReference'] = this.reference();
 
                         deferredResult.collectResults({
                                         'key':MochiKit.Base.partial(MochiKit.Async.succeed, aKey),
                                 'value': MochiKit.Base.method(this, 'getKey'),
                                 'version': MochiKit.Base.partial(MochiKit.Async.succeed, Clipperz.PM.Crypto.encryptingFunctions.currentVersion)
                         });
                         deferredResult.addCallback(Clipperz.PM.Crypto.deferredEncrypt);
                         deferredResult.addCallback(Clipperz.Async.setItem, result, 'previousVersionKey');
                 } else {
                         deferredResult.addCallback(Clipperz.Async.setItem, result, 'previousVersionKey', Clipperz.PM.Crypto.nullValue);
                 }
                 deferredResult.addCallback(MochiKit.Base.bind(Clipperz.PM.DataModel.Record.superclass.prepareRemoteDataWithKey, this, aKey));
                 deferredResult.addCallback(MochiKit.Base.update, result);
                 deferredResult.addMethod(this, 'setRemoteData');
                 
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //=========================================================================
 /*
         'deleteAllCleanTextData': function () {
                 return Clipperz.PM.DataModel.Record.Version.superclass.deleteAllCleanTextData.apply(this, arguments);
         },
 
         'hasAnyCleanTextData': function () {
                 return Clipperz.PM.DataModel.Record.Version.superclass.hasAnyCleanTextData.apply(this, arguments);
         },
 */
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
 
 
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/Record.js b/frontend/gamma/js/Clipperz/PM/DataModel/Record.js
index b816f80..3fc1813 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/Record.js
@@ -1,114 +1,109 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 
 Clipperz.PM.DataModel.Record = function(args) {
-//console.log(">>> new Clipperz.PM.DataModel.Record", args);
         Clipperz.PM.DataModel.Record.superclass.constructor.apply(this, arguments);
 
                 this._updateDate                        = (args.updateDate ? Clipperz.PM.Date.parse(args.updateDate) : Clipperz.Base.exception.raise('MandatoryParameter'));
 
                 this._retrieveIndexDataFunction         = args.retrieveIndexDataFunction|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._updateIndexDataFunction   = args.updateIndexDataFunction  || Clipperz.Base.exception.raise('MandatoryParameter');
 
                 this._retrieveDirectLoginIndexDataFunction      = args.retrieveDirectLoginIndexDataFunction|| null;
                 this._setDirectLoginIndexDataFunction           = args.setDirectLoginIndexDataFunction  || null;
                 this._removeDirectLoginIndexDataFunction        = args.removeDirectLoginIndexDataFunction|| null;
 
                 this._createNewDirectLoginFunction                      = args.createNewDirectLoginFunction             || null;
         
         this._directLogins = {};
 
         this._versions = {};
 
         this._currentRecordVersion = null;
         if (this.isBrandNew()) {
                 var newVersion;
 
                 this.setNotes('');
                 newVersion = new Clipperz.PM.DataModel.Record.Version({
                                 'retrieveKeyFunction':MochiKit.Base.method(this, 'getVersionKey'),
                                 'getVersion':           MochiKit.Base.method(this, 'getVersion')
 
                 });
                 this._versions[newVersion.reference()] = newVersion;
                 this._currentVersionReference = newVersion.reference();
         //      this.setLabel('');
         }
 
-//console.log("<<< new Clipperz.PM.DataModel.Record", args);
-
         return this;
 }
 
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.EncryptedRemoteObject, {
 
         'toString': function() {
                 return "Record (" + this.reference() + ")";
         },
 
         //-------------------------------------------------------------------------
 
         'reference': function () {
                 return this._reference;
         },
         
         //=========================================================================
 
         'getIndexData': function () {
                 return this._retrieveIndexDataFunction(this.reference());
         },
 
         //.........................................................................
 
         'getIndexDataForKey': function (aKey) {
                 return Clipperz.Async.callbacks("Record.getIndexDataForKey", [
                         MochiKit.Base.method(this, 'getIndexData'),
                         MochiKit.Base.itemgetter(aKey)
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'setIndexDataForKey': function (aKey, aValue) {
         //      return this._updateIndexDataFunction(this.reference(), aKey, aValue);
                 
                 var deferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("Record.setIndexDataForKey", {trace:false});
                 deferredResult.addMethod(this, 'getIndexDataForKey', aKey);
                 deferredResult.addCallback(MochiKit.Base.bind(function (aCurrentValue) {
                         var result;
                         var originalValue;
                         
                         originalValue = this.transientState().getValue('originalValues.indexData.' + aKey);
                         if (originalValue == null) {
                                 originalValue = this.transientState().setValue('originalValues.indexData.' + aKey, aCurrentValue);
                         }
@@ -165,238 +160,232 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                         MochiKit.Base.bind(function (someHeaderNotes) {
                                 var result;
 
                                 if ((someHeaderNotes == null) || (typeof(someHeaderNotes) == 'undefined')) {
                                         result = this.getValue('notes');
                                 } else {
                                         result = MochiKit.Async.succeed(someHeaderNotes);
                                 }
                                 
                                 return result;
                         }, this)
                 ], {trace:false});
         },
 
         //.........................................................................
 
         'setNotes': function (aValue) {
                 return this.setValue('notes', aValue);
         },
 
         //=========================================================================
 
         'updateDate': function () {
                 return MochiKit.Async.succeed(this._updateDate);
         },
 
         //=========================================================================
 
         'favicon': function () {
                 var result;
                 var directLogins;
 
                 directLogins = MochiKit.Base.values(this.directLogins());
                 if (directLogins.length > 0) {
                         result = directLogins[0].favicon();
         //      } else if (/* is there an URL to use for searching a favicon */){
                 } else {
                                 result = null; //MochiKit.Async.succeed(Clipperz.PM.Strings['defaultFaviconUrl']);
                 }
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'searchableContent': function () {
                 var deferredResult;
 
-//console.log(">>> searchableContent");
                 deferredResult = new Clipperz.Async.Deferred("Record.searchableContent", {trace:false});
                 
                 deferredResult.collectResults({
                         'recordLabel': MochiKit.Base.method(this, 'label'),
                         'directLoginLabels': [
                                 MochiKit.Base.method(this, 'directLoginReferences'),
                                 MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.itemgetter('label'))
                         ]
                 })
                 deferredResult.addCallback(function (someValues) {
                         return someValues['recordLabel'] + ' ' + someValues['directLoginLabels'].join(' ');
                 });
                 deferredResult.callback();
-//console.log("<<< searchableContent");
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'isMatching': function (aRegExp) {
                 return Clipperz.Async.callbacks("deferredFilterFunction", [
                         MochiKit.Base.method(this, 'searchableContent'),
                         MochiKit.Base.method(aRegExp, 'test'),
                         function (doesItMatch) {
                                 var result;
                                 
                                 if (doesItMatch) {
                                         result = MochiKit.Async.succeed('match');
                                 } else {
                                         result = MochiKit.Async.fail('miss');
                                 }
                                 
                                 return result;
                         }
                 ], {trace:false});
         },
 
         //=========================================================================
 
         'directLogins': function () {
                 return this._directLogins;
         },
 
         'addDirectLogin': function (aDirectLogin) {
                 this._directLogins[aDirectLogin.reference()] = aDirectLogin;
         },
 
         'directLoginWithReference': function (aDirectLoginReference) {
                 return this._directLogins[aDirectLoginReference];
         },
 
         'createNewDirectLoginFunction': function () {
                 return this._createNewDirectLoginFunction;
         },
 
         'saveOriginalDirectLoginStatusToTransientState': function () {
                 if (this.transientState().getValue('directLogins') == null) {
         //              this.transientState().setValue('directLogins', this._directLogins)
-//console.log("SET TRANSIENT STATE", Clipperz.Base.serializeJSON(MochiKit.Base.keys(this.transientState().getValue('directLogins'))))
                         MochiKit.Iter.forEach(MochiKit.Base.keys(this._directLogins), MochiKit.Base.bind(function(aKey) {
                                 this.transientState().setValue('directLogins' + '.' + aKey, this._directLogins[aKey])
                         }, this))
                 }
         },
         
         'createNewDirectLogin': function () {
                 this.saveOriginalDirectLoginStatusToTransientState();
 
                 return this.createNewDirectLoginFunction()(this);
         },
 
         'removeDirectLogin': function(aDirectLogin) {
                 this.saveOriginalDirectLoginStatusToTransientState();
 
                 return Clipperz.Async.callbacks("Record.removeDirectLogin", [
                         MochiKit.Base.method(this, 'removeValue', 'directLogins' + '.' + aDirectLogin.reference()),
                         MochiKit.Base.bind(function () {
                                 delete this._directLogins[aDirectLogin.reference()]
                         }, this)
                 ], {trace:false});
                 
         },
 
         'directLoginReferences': function () {
                 var result;
 
                 result = Clipperz.Async.callbacks("Record.directLoginReferences", [
                         MochiKit.Base.method(this, 'directLogins'),
                         MochiKit.Base.values,
                         function (someDirectLogins) {
                                 var result;
                                 var i,c;
                                 
                                 result = [];
                                 c = someDirectLogins.length;
                                 for (i=0; i<c; i++) {
                                         result.push(Clipperz.Async.collectResults("Record.directLoginReferences - collectResults", {
                                                 '_rowObject': MochiKit.Async.succeed,
                                                 '_reference': MochiKit.Base.methodcaller('reference'),
                                                 'label': MochiKit.Base.methodcaller('label'),
                                                 'favicon': MochiKit.Base.methodcaller('favicon')
                                         }, {trace:false})(someDirectLogins[i]));
                                 };
                                 
                                 return result;
                         },
                         Clipperz.Async.collectAll
                 ], {trace:false});
                 
                 return result;
         },
 
         //=========================================================================
 
         'unpackRemoteData': function (someData) {
                 var result;
 
-//console.log("new Clipperz.PM.DataModel.Record.Version [2]");
 /*
                 this._currentRecordVersion = new Clipperz.PM.DataModel.Record.Version({
                                 'reference':                    someData['currentVersion']['reference'],
                                 'retrieveKeyFunction':  MochiKit.Base.method(this, 'getCurrentRecordVersionKey'),
                                 'remoteData':                   someData['currentVersion'],
                 });
 */
                 var versionKey;
 
                 for (versionKey in someData['versions']) {
-//console.log("### versionKey", versionKey);
                         this._versions[versionKey] = new Clipperz.PM.DataModel.Record.Version({
                                         'reference':            versionKey,
                                         'retrieveKeyFunction':MochiKit.Base.method(this, 'getVersionKey'),
                                         'remoteData':           someData['versions'][versionKey],
                                         'getVersion':           MochiKit.Base.method(this, 'getVersion')
                         })
                 }
                 
         //      this._currentVersionReference = someData['currentVersion']['reference'];
                 this._currentVersionReference = someData['currentVersion'];
-//console.log("=== currentVersionReference", this._currentVersionReference, someData);
 
                 result = Clipperz.PM.DataModel.Record.superclass.unpackRemoteData.apply(this, arguments);
 
                 return result;
         },
         
         //-------------------------------------------------------------------------
 
         'unpackData': function (someData) {
                 var result;
 
                 result = Clipperz.PM.DataModel.Record.superclass.unpackData.apply(this, arguments);
 
                 if (MochiKit.Base.isUndefinedOrNull(result['notes'])) {
                         result['notes'] = ''
                 }
                                 
                 return result;
         },
         
         //-------------------------------------------------------------------------
 
         'prepareRemoteDataWithKey': function (aKey) {
                 var deferredResult;
                         varnewVersionKey;
                 var result;
 
                 newVersionKey = Clipperz.PM.Crypto.randomKey();
                 result = {};
 
                 deferredResult = new Clipperz.Async.Deferred("Record.prepareRemoteDataWithKey", {trace:false});
                 deferredResult.addCallbackList([
                         Clipperz.Async.collectResults("Record.prepareRemoteDataWithKey - collect results", {
                                 'isBrandNew': MochiKit.Base.method(this, 'isBrandNew'),
                                         'versionHasPendingChanges':[
         //                              MochiKit.Base.method(this, 'getCurrentRecordVersion'),
         //                              MochiKit.Base.methodcaller('hasPendingChanges')
                                         MochiKit.Base.method(this, 'invokeCurrentRecordVersionMethod', 'hasPendingChanges')
                                 ]
                         }),
                         Clipperz.Async.or,
 
                         Clipperz.Async.deferredIf("Current Version has pending changes", [
                                 MochiKit.Base.method(this, 'createNewRecordVersion'),
                                 MochiKit.Base.methodcaller('prepareRemoteDataWithKey', newVersionKey),
                                 MochiKit.Base.partial(Clipperz.Async.setItem, result, 'currentRecordVersion'),
                                 MochiKit.Base.method(this, 'setCurrentRecordVersionKey', newVersionKey)
                         ], []),
@@ -491,219 +480,208 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                                         MochiKit.Base.method(this.transientState(), 'setValue', transientStateKey)
                                 ],[
                                         MochiKit.Async.fail
                                 ])
                         ], {trace:false});
                 }
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'versions': function () {
                 return this._versions;
         },
 
         'getVersions': function () {
                 return Clipperz.Async.callbacks("Record.versions", [
                         MochiKit.Base.method(this, 'getValue', 'fakeKey, just to trigger unpackRemoteData'),
                         MochiKit.Base.bind(function () { return this._versions; }, this)
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'getCurrentRecordVersion': function () {
                 return Clipperz.Async.callbacks("Record.getCurrentRecordVersion", [
         //              MochiKit.Base.method(this, 'getValue', 'fakeKey, just to trigger unpackRemoteData'),
         //              MochiKit.Base.bind(function () { return this._currentRecordVersion; }, this)
 
                         MochiKit.Base.method(this, 'versions'),
                         MochiKit.Base.itemgetter(this.currentVersionReference()),
                         Clipperz.Async.deferredIf("The current version is available", [
                                 MochiKit.Async.succeed
                         ], [
                                 MochiKit.Base.method(this, 'getVersions'),
                                 MochiKit.Base.bind(function (someVersions) { return someVersions[this.currentVersionReference()]}, this)
                         ])
                 ], {trace:false});
         },
         
         'setCurrentRecordVersion': function (aRecordVersion) {
                 this._currentVersionReference = aRecordVersion.reference();
         },
 
         //.........................................................................
 
         'currentVersionReference': function () {
-//console.log("currentVersionReference");
                 return this._currentVersionReference;
         },
 
         //-------------------------------------------------------------------------
 
         'createNewRecordVersion': function () {
                 var deferredResult;
                 
                 if (this.isBrandNew()) {
                         deferredResult = this.getCurrentRecordVersion();
                 } else {
                         var newVersion;
                         
                         newVersion = new Clipperz.PM.DataModel.Record.Version({
                                 //      'reference':            versionKey,
                                         'retrieveKeyFunction':MochiKit.Base.method(this, 'getVersionKey'),
         //                              'remoteData':           {},
                                         'getVersion':           MochiKit.Base.method(this, 'getVersion')
                         })
                         this._versions[newVersion.reference()] = newVersion;
 
                         deferredResult = Clipperz.Async.callbacks("Record.createNewRecordVersion", [
         //                      MochiKit.Base.method(this, 'getCurrentRecordVersion'),
         //                      MochiKit.Base.methodcaller('values'),
                                 MochiKit.Base.method(this, 'invokeCurrentRecordVersionMethod', 'values'),
                                 MochiKit.Base.method(newVersion, 'setValues'),
 
                                 Clipperz.Async.collectResults("Record.createNewRecordVersion [collect results]", {
                                                 'reference':MochiKit.Base.method(this, 'currentVersionReference'),
                                                 'key':                  MochiKit.Base.method(this, 'getCurrentRecordVersionKey')
                                 }, {trace:false}),
                                 MochiKit.Base.method(newVersion, 'setPreviousVersionReferenceAndKey'),
 
         //                      MochiKit.Base.method(this, 'getCurrentRecordVersion'),
         //                      MochiKit.Base.method(this, 'revertChanges'),
                                 MochiKit.Base.method(this, 'invokeCurrentRecordVersionMethod', 'revertChanges'),
 
                                 MochiKit.Base.method(this, 'setCurrentRecordVersion', newVersion),
                                 MochiKit.Base.partial(MochiKit.Async.succeed, newVersion)
                         ], {trace:false});
                 }
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'getCurrentRecordVersionKey': function () {
-//console.log("getCurrentRecordVersionKey");
                 return Clipperz.Async.callbacks("Record.getCurrentRecordVersionKey", [
                         MochiKit.Base.method(this, 'getValue', 'currentVersionKey'),
                         Clipperz.Async.deferredIf("currentVersionKey is NOT null", [
                                 MochiKit.Async.succeed
                         ], [
                                 MochiKit.Base.method(this, 'getKey')
                         ])
                 ], {trace:false});
         },
 
         'setCurrentRecordVersionKey': function (aValue) {
                         //TODO: triple check this method!
                 return Clipperz.Async.callbacks("Record.setCurrentRecordVersionKey", [
                         MochiKit.Base.method(this, 'setValue', 'currentVersionKey', aValue)
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'invokeCurrentRecordVersionMethod': function (aMethodName, someValues) {
-//console.log(">>> invokeCurrentRecordVersionMethod", aMethodName);
                 return Clipperz.Async.callbacks("Record.invokeCurrentRecordVersionMethod", [
                         MochiKit.Base.method(this, 'getCurrentRecordVersion'),
-//function (aValue) { console.log("=== getCurrentRecordVersion", aValue); return aValue},
                         MochiKit.Base.methodcaller(aMethodName, someValues)
                 ], {trace:false});
         },
 
 
         'lazilyinvokeCurrentRecordVersionMethod': function (aMethodName, someValues, defaultResult) {
                 return Clipperz.Async.callbacks("Record.lazilyinvokeCurrentRecordVersionMethod", [
                         MochiKit.Base.method(this, 'currentVersionReference'),
-//function (aValue) { console.log("LAZY -> versions", aValue); return aValue; },
                         Clipperz.Async.deferredIf("versions has been loaded", [
-//function (aValue) { console.log("LAZY -> then"); return aValue; },
                                 MochiKit.Base.method(this, 'getCurrentRecordVersion'),
                                 MochiKit.Base.methodcaller(aMethodName, someValues),
-//function (aValue) { console.log("LAZY <- then"); return aValue; }
                         ], [
-//function (aValue) { console.log("LAZY -> else"); return aValue; },
                                 MochiKit.Base.partial(MochiKit.Async.succeed, defaultResult),
-//function (aValue) { console.log("LAZY <- else"); return aValue; }
                         ])
                 ], {trace:false});
         },
 
         //=========================================================================
 
         'hasPendingChanges': function () {
                 var deferredResult;
 
                 if (this.hasInitiatedObjectDataStore()) {
                         deferredResult = new Clipperz.Async.Deferred("Clipperz.PM.DataModel.Record.hasPendingChanges", {trace:false});
                         deferredResult.collectResults({
                                 'super': MochiKit.Base.bind(Clipperz.PM.DataModel.Record.superclass.hasPendingChanges, this),
                                 'currentVersion': [
         //                              MochiKit.Base.method(this, 'getCurrentRecordVersion'),
         //                              MochiKit.Base.methodcaller('hasPendingChanges')
                                         MochiKit.Base.method(this, 'invokeCurrentRecordVersionMethod', 'hasPendingChanges')
                                 ],
                                 'directLogins': [
                                         MochiKit.Base.method(this, 'directLogins'),
-//function (aValue) { console.log("Record.directLogins", aValue); return aValue; },
                                         MochiKit.Base.values,
                                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('hasPendingChanges')),
                                         Clipperz.Async.collectAll,
                                         Clipperz.Async.or
         //                              function(someValues) {
         //                                      return MochiKit.Iter.some(someValues, MochiKit.Base.operator.identity);
         //                              }
                                 ]
                         });
-//deferredResult.addCallback(function (aValue) { console.log("Record.hasPendingResults", aValue); return aValue; });
                         deferredResult.addCallback(MochiKit.Base.values);
                         deferredResult.addCallback(MochiKit.Base.bind(function(someValues) {
                                 var result;
                                 result = MochiKit.Iter.some(someValues, MochiKit.Base.operator.identity);
 
                                 if ((result == false) && (this.isBrandNew() == false)) {
                                         result = MochiKit.Iter.some(MochiKit.Base.values(this.transientState().getValue('hasPendingChanges.indexData')), MochiKit.Base.operator.identity);
                                 }
                 
                                 return result;
                         }, this));
 
                         deferredResult.callback();
                 } else {
                         deferredResult = Clipperz.Async.callbacks("Recrod.hasPendingChanges [hasInitiatedObjectDataStore == false]", [
                                 MochiKit.Base.method(this, 'directLogins'),
                                 MochiKit.Base.values,
                                 MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('hasPendingChanges')),
                                 Clipperz.Async.collectAll,
                                 Clipperz.Async.or
         //                      function(someValues) {
         //                              return MochiKit.Iter.some(someValues, MochiKit.Base.operator.identity);
         //                      }
                         ], {trace:false})
                 }
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'hasPendingChangesWhenBrandNew': function () {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("Clipperz.PM.DataModel.Record.hasPendingChangesWhenBrandNew", {trace:false});
                 deferredResult.collectResults({
                         'label': [
                                 MochiKit.Base.method(this, 'label'),
                                 MochiKit.Base.partial(MochiKit.Base.operator.ne, '')
                         ],
                         'notes': [
                                 MochiKit.Base.method(this, 'notes'),
                                 MochiKit.Base.partial(MochiKit.Base.operator.ne, '')
                         ]
                 });
         //      deferredResult.addCallback(MochiKit.Base.values);
         //      deferredResult.addCallback(function(someValues) {
         //              return MochiKit.Iter.some(someValues, MochiKit.Base.operator.identity);
@@ -731,137 +709,135 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'revertChanges': function () {
                 var deferredResult;
 
                 if (this.isBrandNew() == false) {
                         deferredResult = new Clipperz.Async.Deferred("Clipperz.PM.DataModel.Record.revertChanges", {trace:false});
                         deferredResult.addMethod(this, 'hasPendingChanges');
                         deferredResult.addIf([
         //                      MochiKit.Base.method(this, 'getCurrentRecordVersion'),
         //                      MochiKit.Base.methodcaller('revertChanges'),
                                 MochiKit.Base.method(this,'invokeCurrentRecordVersionMethod', 'revertChanges'),
 
                                 MochiKit.Base.method(this, 'directLogins'),
                                 MochiKit.Base.values,
                                 MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('revertChanges')),
 
                                 MochiKit.Base.bind(Clipperz.PM.DataModel.Record.superclass.revertChanges, this)
                         ], [
                                 MochiKit.Async.succeed
                         ]);
                         deferredResult.callback();
                 } else {
         //              this.deleteAllCleanTextData();
                         deferredResult = MochiKit.Async.succeed();
                 }
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'resetTransientState': function (isCommitting) {
         //      if ((isCommitting == false) && (this.transientState().getValue('directLogins') != null)) {
         //              this._directLogins = this.transientState().getValue('directLogins');
         //      }
 
                 return Clipperz.Async.callbacks("Record.resetTransientState", [
         //-             MochiKit.Base.method(this, 'getCurrentRecordVersion'),
         //-             MochiKit.Base.methodcaller('resetTransientState'),
         //              MochiKit.Base.method(this, 'invokeCurrentRecordVersionMethod', 'resetTransientState'),
                         MochiKit.Base.method(this, 'lazilyinvokeCurrentRecordVersionMethod', 'resetTransientState'),
 
                         MochiKit.Base.method(this, 'directLogins'),
-//function (aValue) { console.log("resetTransientState - directLogins", aValue); return aValue; },
                         MochiKit.Base.values,
                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('resetTransientState')),
 
                         MochiKit.Base.bind(function () {
                                 if ((isCommitting == false) && (this.transientState().getValue('directLogins') != null)) {
                                         this._directLogins = this.transientState().getValue('directLogins');
                                 }
                         }, this),
 
                         MochiKit.Base.bind(Clipperz.PM.DataModel.Record.superclass.resetTransientState, this, isCommitting)
                 ], {trace:false})
         },
 
         //-------------------------------------------------------------------------
         
         'commitTransientState': function () {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("Clipperz.PM.DataModel.Record.commitTransientState", {trace:false});
                 deferredResult.addMethod(this, 'hasPendingChanges');
                 deferredResult.addIf([
                         MochiKit.Base.bind(Clipperz.PM.DataModel.Record.superclass.commitTransientState, this),
         //              MochiKit.Base.method(this, 'getCurrentRecordVersion'),
         //              MochiKit.Base.methodcaller('commitTransientState'),
                         MochiKit.Base.method(this, 'invokeCurrentRecordVersionMethod', 'commitTransientState'),
                         MochiKit.Base.method(this, 'directLogins'),
                         MochiKit.Base.values,
                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('commitTransientState'))
                 ], [
                         MochiKit.Async.succeed
                 ]);
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'retrieveDirectLoginIndexDataFunction': function () {
-//console.log("Record.retrieveDirectLoginIndexDataFunction", this._retrieveDirectLoginIndexDataFunction);
                 return this._retrieveDirectLoginIndexDataFunction;
         },
         
         'setDirectLoginIndexDataFunction': function () {
                 return this._setDirectLoginIndexDataFunction;
         },
         
         'removeDirectLoginIndexDataFunction': function () {
                 return this._removeDirectLoginIndexDataFunction;
         },
 
         //=========================================================================
 
         'deleteAllCleanTextData': function () {
         //      return Clipperz.PM.DataModel.Record.superclass.deleteAllCleanTextData.apply(this, arguments);
 
                 return Clipperz.Async.callbacks("Record.deleteAllCleanTextData", [
                         MochiKit.Base.method(this, 'versions'),
                         MochiKit.Base.values,
                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('deleteAllCleanTextData')),
 
                         MochiKit.Base.method(this, 'directLogins'),
                         MochiKit.Base.values,
                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('deleteAllCleanTextData')),
 
                         MochiKit.Base.bind(Clipperz.PM.DataModel.Record.superclass.deleteAllCleanTextData, this)
                 ], {trace:false});
         },
 
         'hasAnyCleanTextData': function () {
         //      return Clipperz.PM.DataModel.Record.superclass.hasAnyCleanTextData.apply(this, arguments);
 
                 return Clipperz.Async.callbacks("Record.hasAnyCleanTextData", [
                         Clipperz.Async.collectResults("Record.hasAnyCleanTextData [collect results]", {
                                         'versions':[
                                         MochiKit.Base.method(this, 'versions'),
                                         MochiKit.Base.values,
                                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('hasAnyCleanTextData')),
                                         Clipperz.Async.collectAll
                                 ],
                                 'directLogins': [
                                         MochiKit.Base.method(this, 'directLogins'),
                                         MochiKit.Base.values,
                                         MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('hasAnyCleanTextData')),
                                         Clipperz.Async.collectAll
                                 ],
                                 'super': [
                                         MochiKit.Base.bind(Clipperz.PM.DataModel.Record.superclass.hasAnyCleanTextData, this)
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Legacy.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Legacy.js
index d6202ff..cda5a41 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Legacy.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Legacy.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 try { if (typeof(Clipperz.PM.DataModel.User) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.PM.DataModel.User.Header.Legacy depends on Clipperz.PM.DataModel.User!";
 }  
 
 if (typeof(Clipperz.PM.DataModel.User.Header) == 'undefined') { Clipperz.PM.DataModel.User.Header = {}; }
 
 Clipperz.PM.DataModel.User.Header.Legacy = function(args) {
         //args = args || {};
         Clipperz.PM.DataModel.User.Header.Legacy.superclass.constructor.apply(this, arguments);
         
                 this._retrieveRecordDetailFunction = args.retrieveRecordDetailFunction|| Clipperz.Base.exception.raise('MandatoryParameter');
         this._records = null;
         //this._directLogins = null;
 
         return this;
 }
 
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.Legacy, Clipperz.PM.DataModel.EncryptedRemoteObject, {
 
         'toString': function() {
                 return "Clipperz.PM.DataModel.User.Header.Legacy";
         },
 
         //-------------------------------------------------------------------------
 
         'retrieveRecordDetailFunction': function () {
                 return this._retrieveRecordDetailFunction;
         },
 
         //-------------------------------------------------------------------------
 
         'getRecordKey': function (aRecordReference) {
                 var deferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("User.Header.Legacy.getRecordKey", {trace:false});
                 deferredResult.addMethod(this, 'getRecordIndexData');
                 deferredResult.addCallback(MochiKit.Base.itemgetter('key'))
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //=========================================================================
         
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.OneTimePasswords.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.OneTimePasswords.js
index 3528db6..e82da47 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.OneTimePasswords.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.OneTimePasswords.js
@@ -1,125 +1,117 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 try { if (typeof(Clipperz.PM.DataModel.User) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.PM.DataModel.User.Header.OneTimePasswords depends on Clipperz.PM.DataModel.User!";
 }  
 if (typeof(Clipperz.PM.DataModel.User.Header) == 'undefined') { Clipperz.PM.DataModel.User.Header = {}; }
 
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.DataModel.User.Header.OneTimePasswords = function(args) {
         Clipperz.PM.DataModel.User.Header.OneTimePasswords.superclass.constructor.apply(this, arguments);
 
         this._oneTimePasswords = null;
         
         return this;
 }
 
 //-----------------------------------------------------------------------------
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.OneTimePasswords, Clipperz.PM.DataModel.EncryptedRemoteObject, {
 
         'toString': function() {
                 return "Clipperz.PM.DataModel.User.Header.OneTimePasswords";
         },
 
         //-------------------------------------------------------------------------
 /*
                 'packData': function (someData) {       //++
                 var result;
 
-console.log(">>> OneTimePasswords.packData", someData);
                 result = Clipperz.PM.DataModel.User.Header.OneTimePasswords.superclass.packData.apply(this, arguments);
-console.log("<<< OneTimePasswords.packData");
 
                 return result;
         },
 */
         //-------------------------------------------------------------------------
 /*
         'packRemoteData': function (someData) {
                 var result;
 
-console.log(">>> OneTimePasswords.packRemoteData", someData);
                 result = Clipperz.PM.DataModel.User.Header.OneTimePasswords.superclass.packRemoteData.apply(this, arguments);
-console.log("<<< OneTimePasswords.packRemoteData");
 
                 return result;
         },
 */
         //-------------------------------------------------------------------------
 /*
         'prepareRemoteDataWithKey': function (aKey) {
                 var result;
 
-console.log(">>> OneTimePasswords.prepareRemoteDataWithKey");
                 result = Clipperz.PM.DataModel.User.Header.OneTimePasswords.superclass.prepareRemoteDataWithKey.apply(this, arguments);
-console.log("<<< OneTimePasswords.prepareRemoteDataWithKey");
 
                 return result;
         },
 */
         //=========================================================================
 
         'oneTimePasswords': function () {
                         vardeferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("User.Header.OneTimePasswords.oneTimePasswords", {trace:false});
                 if (this._oneTimePasswords == null) {
                         deferredResult.addMethod(this, 'values')
                         deferredResult.addCallback(MochiKit.Base.bind(function (someData) {
                                         varotpKey;
                                 
                                 this._oneTimePasswords = {};
                                 
                                 for (otpKey in someData) {
                                         var otp;
                                         var otpParameters;
                                         
                                         otpParameters = Clipperz.Base.deepClone(someData[otpKey]);
                                         otpParameters['reference'] = otpKey;
                                         
                                         otp = new Clipperz.PM.DataModel.OneTimePassword(otpParameters);
                                         this._oneTimePasswords[otpKey] = otp;
                                 }
 
                                 return this._oneTimePasswords;
 
                         }, this));
                         deferredResult.callback();
                 } else {
                         deferredResult = MochiKit.Async.succeed(this._oneTimePasswords);
                 }
                 
                 return deferredResult;
         },
 
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
 
 //-----------------------------------------------------------------------------
 
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Preferences.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Preferences.js
index b164889..f1f95e8 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Preferences.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.Preferences.js
@@ -1,50 +1,48 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 try { if (typeof(Clipperz.PM.DataModel.User) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.PM.DataModel.User.Header.Preferences depends on Clipperz.PM.DataModel.User!";
 }  
 
 if (typeof(Clipperz.PM.DataModel.User.Header) == 'undefined') { Clipperz.PM.DataModel.User.Header = {}; }
 
 Clipperz.PM.DataModel.User.Header.Preferences = function(args) {
         Clipperz.PM.DataModel.User.Header.Preferences.superclass.constructor.apply(this, arguments);
         
         return this;
 }
 
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.Preferences, Clipperz.PM.DataModel.EncryptedRemoteObject, {
 
         'toString': function() {
                 return "Clipperz.PM.DataModel.User.Header.Preferences";
         },
 
         //-------------------------------------------------------------------------
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
 
 
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.RecordIndex.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.RecordIndex.js
index f77ea80..5681f70 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.RecordIndex.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.Header.RecordIndex.js
@@ -1,512 +1,496 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 try { if (typeof(Clipperz.PM.DataModel.User) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.PM.DataModel.User.Header.RecordIndex depends on Clipperz.PM.DataModel.User!";
 }  
 
 if (typeof(Clipperz.PM.DataModel.User.Header) == 'undefined') { Clipperz.PM.DataModel.User.Header = {}; }
 
 Clipperz.PM.DataModel.User.Header.RecordIndex = function(args) {
         Clipperz.PM.DataModel.User.Header.RecordIndex.superclass.constructor.apply(this, arguments);
 
-//console.log("NEW Clipperz.PM.DataModel.User.Header.RecordIndex", args);
         this._recordsData = new Clipperz.PM.DataModel.EncryptedRemoteObject({
                         'name':'recordsData',
                 'retrieveKeyFunction': args.retrieveKeyFunction,
                 'remoteData': {
                         'data': args.recordsData['data'],
                         'version': args.encryptedDataVersion,
                         'recordsStats': args.recordsStats
                 }//,
         //              'encryptedDataKeypath':                 'data',
         //              'encryptedVersionKeypath':      'version'
         });
 
         this._directLoginsData = new Clipperz.PM.DataModel.EncryptedRemoteObject({
                         'name':'directLoginsData',
                 'retrieveKeyFunction': args.retrieveKeyFunction,
                 'remoteData': {
                         'data': args.directLoginsData['data'],
                         'version': args.encryptedDataVersion
                 }//,
         //              'encryptedDataKeypath':                 'data',
         //              'encryptedVersionKeypath':      'version'
         });
 
         this._lock = new MochiKit.Async.DeferredLock();
         this._transientState = null;
 
                 this._retrieveRecordDetailFunction      = args.retrieveRecordDetailFunction|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._recordsIndex                                      = args.recordsData['index']             || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._directLoginsIndex                                 = args.directLoginsData['index']|| Clipperz.Base.exception.raise('MandatoryParameter');
 
         this._records = null;
 
         return this;
 }
 
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.RecordIndex, Object, {
 
         'toString': function() {
                 return "Clipperz.PM.DataModel.User.Header.RecordIndex";
         },
 
         //-------------------------------------------------------------------------
 
         'retrieveRecordDetailFunction': function () {
                 return this._retrieveRecordDetailFunction;
         },
 
         //-------------------------------------------------------------------------
 
         'recordsIndex': function () {
                 return this._recordsIndex;
         },
 
         'recordsData': function () {
                 return this._recordsData;
         },
         
         //-------------------------------------------------------------------------
 
         'directLoginsIndex': function () {
                 return this._directLoginsIndex;
         },
 
         'directLoginsData': function () {
                 return this._directLoginsData;
         },
 
         //-------------------------------------------------------------------------
 
         'lock': function () {
                 return this._lock;
         },
 
         //-------------------------------------------------------------------------
 
         'transientState': function () {
                 if (this._transientState == null) {
                         this._transientState = new Clipperz.KeyValueObjectStore(/*{'name':'User.Header.RecordIndex.transientState [1]'}*/);
                 }
                 
                 return this._transientState;
         },
 
         'resetTransientState': function (isCommitting) {
-//console.log("######## UserHeaderRecordIndex - resetTransientState", Clipperz.Base.deepClone(this._transientState));
                 if (this._transientState != null) {
                         this._transientState.removeAllData();
                 }
 
                 this._transientState = null;
         },
 
         //-------------------------------------------------------------------------
 
         'getRecordKey': function (aRecordReference) {
                 return Clipperz.Async.callbacks("User.Header.RecordIndex.getRecordKey", [
                         MochiKit.Base.method(this, 'getRecordIndexData', aRecordReference),
                         MochiKit.Base.itemgetter('key')
                 ], {trace:false});
         },
 
         'setRecordKey': function (aRecordReference, aValue) {
                 return this.updateRecordIndexData(aRecordReference, 'key', aValue);
         },
 
         //-------------------------------------------------------------------------
         
         'getRecordIndexData': function (aRecordReference) {
                 return this.recordsData().getValue(this.recordsIndex()[aRecordReference]);
         },
 
         //.........................................................................
 
         'updateRecordIndexData': function (aRecordReference, aKey, aValue) {
                 return this.recordsData().setValue(this.recordsIndex()[aRecordReference]+'.'+aKey, aValue);
         },
 
         //-------------------------------------------------------------------------
 
         'getDirectLoginIndexData': function (aDirectLoginReference) {
                 return this.directLoginsData().getValue(this.directLoginsIndex()[aDirectLoginReference]);
         },
 
         'setDirectLoginIndexData': function (aDirectLoginReference, aKey, aValue) {
-//console.log("UserHeaderRecordIndex.setDirectLoginIndexData", aDirectLoginReference, this.directLoginsIndex()[aDirectLoginReference], aKey);
 //if (MochiKit.Base.isUndefinedOrNull(this.directLoginsIndex()[aDirectLoginReference])) {
         //throw "PIPPO";
 //}
                 return this.directLoginsData().setValue(this.directLoginsIndex()[aDirectLoginReference] + '.' + aKey, aValue);
         },
 
         'addDirectLoginIndexData': function (aDirectLoginReference) {
-//console.log("UserHeaderRecordIndex.addDirectLoginIndexData", aDirectLoginReference, this.directLoginsIndex()[aDirectLoginReference]);
                 return this.directLoginsData().setValue(this.directLoginsIndex()[aDirectLoginReference], {});
         },
         
         'removeDirectLoginIndexData': function (aDirectLoginReference) {
                 return this.directLoginsData().removeValue(this.directLoginsIndex()[aDirectLoginReference])
         },
 
         //-------------------------------------------------------------------------
 
         'records': function () {
                         vardeferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("User.Header.RecordIndex.records", {trace:false});
                 deferredResult.acquireLock(this.lock());
                 deferredResult.addCallback(MochiKit.Base.bind(function () {
                         var innerDeferredResult;
 
                         if (this._records == null) {
                                 innerDeferredResult = new Clipperz.Async.Deferred("User.Header.RecordIndex.records <inner deferred>", {trace:false});
                                 innerDeferredResult.collectResults({
                                         'records': [
         //                                      MochiKit.Base.method(this.recordsData(), 'getObjectDataStore'),
         //                                      MochiKit.Base.methodcaller('values')
                                                 MochiKit.Base.method(this.recordsData(), 'values')
                                         ],
                                         'recordsStats': [
                                                 MochiKit.Base.method(this.recordsData(), 'getRemoteData'),
                                                 MochiKit.Base.itemgetter('recordsStats')
                                         ],
                                         'directLogins': [
         //                                      MochiKit.Base.method(this.directLoginsData(), 'getObjectDataStore'),
         //                                      MochiKit.Base.methodcaller('values')
                                                 MochiKit.Base.method(this.directLoginsData(), 'values')
                                         ]
                                 })
                                 innerDeferredResult.addCallback(MochiKit.Base.bind(function (someData) {
                                         var indexReference;
                                         var recordsInvertedIndex;
                                         var directLoginsInvertedIndex;
                                         
                                                 recordsInvertedIndex    = Clipperz.PM.DataModel.User.Header.RecordIndex.invertIndex(this.recordsIndex());
                                                 directLoginsInvertedIndex= Clipperz.PM.DataModel.User.Header.RecordIndex.invertIndex(this.directLoginsIndex());
 
                                         this._records = {};
 
                                         for (indexReference in someData['records']) {
                                                         varrecord;
                                                 var reference;
                                                 var updateDate;
 
                                                 reference = recordsInvertedIndex[indexReference];
                                                 
                                                 if (typeof(someData['recordsStats'][reference]) != 'undefined') {
                                                         updateDate = someData['recordsStats'][reference]['updateDate'];
                                                 
                                                         record = new Clipperz.PM.DataModel.Record({
                                                                         'reference':                            reference,
                                                                         'retrieveKeyFunction':          MochiKit.Base.method(this, 'getRecordKey'),
                                                                         'retrieveRemoteDataFunction':this.retrieveRecordDetailFunction(),
 
                                                                         'retrieveIndexDataFunction':MochiKit.Base.method(this, 'getRecordIndexData'),
                                                                         'updateIndexDataFunction':      MochiKit.Base.method(this, 'updateRecordIndexData'),
                                                                         'updateDate':                           updateDate,
 
                                                                         'retrieveDirectLoginIndexDataFunction':MochiKit.Base.method(this, 'getDirectLoginIndexData'),
                                                                         'setDirectLoginIndexDataFunction':      MochiKit.Base.method(this, 'setDirectLoginIndexData'),
                                                                         'removeDirectLoginIndexDataFunction':MochiKit.Base.method(this, 'removeDirectLoginIndexData'),
                                                         
                                                                         'createNewDirectLoginFunction':                 MochiKit.Base.method(this, 'createNewDirectLogin')
                                                         });
                 
                                                         this._records[reference] = record;
                                                 } else {
 Clipperz.log("SKIPPING record " + reference + " as there are no stas associated - " + Clipperz.Base.serializeJSON(someData['records'][reference]));
                                                                 //# skip the record, as it seems it is not present in the DB
                                                                 //updateDate = Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
                                                 }
                                         }
 
                                         for (indexReference in someData['directLogins']) {
         //                                              vardirectLogin;
                                                 var reference;
                                                 var record;
 
                                                 reference = directLoginsInvertedIndex[indexReference];
                                                 record = this._records[recordsInvertedIndex[someData['directLogins'][indexReference]['record']]];
 
                                                 if (record != null) {
         //                                              directLogin = new Clipperz.PM.DataModel.DirectLogin({
                                                         new Clipperz.PM.DataModel.DirectLogin({
                                                                         'reference':                            reference,
                                                                         'record':                                       record
                                                         });
                                                 } else {
-Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
-//console.log("direct login data", someData['directLogins']);
-//console.log("current direct login data", someData['directLogins'][indexReference])
-//console.log("reference", reference);
-//console.log("record index", this.recordsIndex());
-//console.log("record inverted index", recordsInvertedIndex);
+                                                        Clipperz.logWarning("WARNING: DIRECT LOGIN without a matching RECORD!!");
                                                 }
                                         }
 
                                         return this._records;
                                 }, this));
                                 innerDeferredResult.callback();
                         } else {
                                 innerDeferredResult = MochiKit.Async.succeed(this._records);
                         }
                         
                         return innerDeferredResult;
                 }, this));
                 deferredResult.releaseLock(this.lock());
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'updateRecordIndexForNewRecord': function (aNewRecord) {
                 var newRecordIndex;
                 var recordReference;
 
                 recordReference = aNewRecord.reference();
                 newRecordIndex = (MochiKit.Base.listMax(MochiKit.Base.map(MochiKit.Base.partial(MochiKit.Base.operator.mul, 1), MochiKit.Base.values(this.recordsIndex()))) + 1) + '';
                 this.recordsIndex()[recordReference] = newRecordIndex;
                 
                         this.transientState().setValue('newlyCreatedRecordsIndex'       + '.' + recordReference, newRecordIndex);
                         this.transientState().setValue('newlyCreatedRecordsReferences'+ '.' + recordReference, aNewRecord);
         },
 
         //.........................................................................
         
         'createNewRecord': function () {
                 var deferredResult;
                 var newRecord;
 
-//console.log("#### new Clipperz.PM.DataModel.Record [4]");
                 newRecord = new Clipperz.PM.DataModel.Record({
                                 'retrieveKeyFunction':          MochiKit.Base.method(this, 'getRecordKey'),
                                 'retrieveRemoteDataFunction':this.retrieveRecordDetailFunction(),
 
                                 'retrieveIndexDataFunction':MochiKit.Base.method(this, 'getRecordIndexData'),
                                 'updateIndexDataFunction':      MochiKit.Base.method(this, 'updateRecordIndexData'),
                                 'updateDate':                           Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
 
                                 'retrieveDirectLoginIndexDataFunction':MochiKit.Base.method(this, 'getDirectLoginIndexData'),
                                 'setDirectLoginIndexDataFunction':      MochiKit.Base.method(this, 'setDirectLoginIndexData'),
                                 'removeDirectLoginIndexDataFunction':MochiKit.Base.method(this, 'removeDirectLoginIndexData'),
 
                                 'createNewDirectLoginFunction':                 MochiKit.Base.method(this, 'createNewDirectLogin')
                 });
 
                 this.transientState().setValue('newRecordsReferences' + '.' + newRecord.reference(), newRecord);
                 this.updateRecordIndexForNewRecord(newRecord);
 
                 deferredResult = Clipperz.Async.callbacks("User.Header.RecordIndex.createNewRecord", [
                         MochiKit.Base.method(this, 'records'),
                         MochiKit.Base.partial(Clipperz.Async.setItemOnObject, newRecord.reference(), newRecord),
                         MochiKit.Base.method(this, 'setRecordKey', newRecord.reference(), Clipperz.PM.Crypto.randomKey()),
                         MochiKit.Base.method(newRecord, 'setLabel', ''),
                         MochiKit.Base.partial(MochiKit.Async.succeed, newRecord)
                 ], {trace:false});
 
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'deleteRecord': function (aRecord) {
                 var deferredResult;
                 var recordReference;
                 
                 recordReference = aRecord.reference();
 
                 deferredResult = new Clipperz.Async.Deferred("User.Header.RecordIndex.deleteRecord", {trace:false});
 
                 deferredResult.addMethod(aRecord, 'directLogins');
                 deferredResult.addCallback(MochiKit.Base.values);
                 deferredResult.addCallback(MochiKit.Base.map, MochiKit.Base.method(this, 'removeDirectLogin'));
 
                 deferredResult.addMethod(this.recordsData(),  'removeValue', this.recordsIndex()[recordReference]);
                 deferredResult.addCallback(MochiKit.Base.bind(function () {
                         this.transientState().setValue('deleteRecordsIndex' + '.' + recordReference, this.recordsIndex()[recordReference]);
                         delete this.recordsIndex()[recordReference];
                 }, this));
                 
                 deferredResult.addMethod(this,  'records');
                 deferredResult.addCallback(MochiKit.Base.itemgetter(recordReference));
                 deferredResult.addMethod(this.transientState(), 'setValue', 'deleteRecordsReferences' + '.' + recordReference);
 
                 deferredResult.addMethod(this,  'records');
                 deferredResult.addCallback(MochiKit.Base.bind(function (someRecords) {
                         delete someRecords[recordReference];
                 }, this));
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'removeDirectLogin': function (aDirectLogin) {
                 this.directLoginsData().removeValue(this.directLoginsIndex()[aDirectLogin.reference()]);
         },
         
         //-------------------------------------------------------------------------
 
         'createNewDirectLogin': function (aRecord) {
                 var newDirectLogin;
                         varnewDirectLoginIndexValue;
 
                 newDirectLogin = new Clipperz.PM.DataModel.DirectLogin({record:aRecord});
                 newDirectLoginIndexValue = MochiKit.Base.listMax(MochiKit.Base.map(function (aValue) { return aValue * 1; }, MochiKit.Base.values(this.directLoginsIndex()))) + 1;
 
                 this.transientState().setValue('newDirectLoginReferences' + '.' + newDirectLogin.reference(), newDirectLogin);
 
-//console.log("UserHeaderRecordIndex.createNewDirectLogin [1]", newDirectLogin.reference(), newDirectLoginIndexValue);
                 this.directLoginsIndex()[newDirectLogin.reference()] = newDirectLoginIndexValue;
-//console.log("UserHeaderRecordIndex.createNewDirectLogin [2]", newDirectLogin.reference(), this.directLoginsIndex()[newDirectLogin.reference()]);
                 this.directLoginsData().setValue(this.directLoginsIndex()[newDirectLogin.reference()], {'record': this.recordsIndex()[aRecord.reference()]});
         
                 return newDirectLogin;
         },
 
         //=========================================================================
 
         'deleteAllCleanTextData': function () {
                 return Clipperz.Async.callbacks("User.Header.RecordIndex.deleteAllCleanTextData", [
         //              MochiKit.Base.method(this, 'records'),
         //              MochiKit.Base.values,
         //              MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('deleteAllCleanTextData')),
 
                         MochiKit.Base.method(this, 'recordsData'),
                         MochiKit.Base.methodcaller('deleteAllCleanTextData'),
                         MochiKit.Base.method(this, 'directLoginsData'),
                         MochiKit.Base.methodcaller('deleteAllCleanTextData')
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'hasAnyCleanTextData': function () {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred({trace:false});
                 deferredResult.collectResults({
                         'recordsData': [
                                 MochiKit.Base.method(this, 'recordsData'),
                                 MochiKit.Base.methodcaller('hasAnyCleanTextData')
                         ],
                                 'directLoginsData':[
                                 MochiKit.Base.method(this, 'directLoginsData'),
                                 MochiKit.Base.methodcaller('hasAnyCleanTextData')
                         ],
         //              'records': [
         //                      MochiKit.Base.method(this, 'records'),
         //                      MochiKit.Base.values,
         //                      MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.methodcaller('hasAnyCleanTextData')),
         //                      Clipperz.Async.collectAll
         //              ]
                 });
-//deferredResult.addCallback(function (aValue) { console.log("USER.Header.RecordIndex.hasAnyCleanTextData", aValue); return aValue});
 
         //      deferredResult.addCallback(MochiKit.Base.values);
         //      deferredResult.addCallback(MochiKit.Base.flattenArguments);
         //      deferredResult.addCallback(function(someValues) {
         //              return MochiKit.Iter.some(someValues, MochiKit.Base.operator.identity);
         //      });
                 deferredResult.addCallback(Clipperz.Async.or);
                 
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'hasPendingChanges': function () {
                         vardeferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("User.Header.RecordIndex.hasPendingChanges", {trace:false});
                 deferredResult.collectResults({
                         'recordsData': [
                                 MochiKit.Base.method(this, 'recordsData'),
                                 MochiKit.Base.methodcaller('hasPendingChanges')
                         ],
                         'directLoginsData': [
                                 MochiKit.Base.method(this, 'directLoginsData'),
                                 MochiKit.Base.methodcaller('hasPendingChanges')
                         ]
                 });
-//deferredResult.addCallback(function (aValue) { console.log("UserHeaderIndex.hasPendingResults", aValue); return aValue; });
                 deferredResult.addCallback(Clipperz.Async.or);
         //      deferredResult.addCallback(MochiKit.Base.values);
         //      deferredResult.addCallback(MochiKit.Base.flattenArguments);
         //      deferredResult.addCallback(function(someValues) {
         //              return MochiKit.Iter.some(someValues, MochiKit.Base.operator.identity);
         //      });
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'commitTransientState': function () {
                 var deferredResult;
 
                 deferredResut = Clipperz.Async.callbacks("User.Header.RecordIndex.commitTransientState", [
                         MochiKit.Base.method(this, 'recordsData'),
                         MochiKit.Base.methodcaller('commitTransientState'),
 
                         MochiKit.Base.method(this, 'directLoginsData'),
                         MochiKit.Base.methodcaller('commitTransientState'),
                         
                         MochiKit.Base.method(this, 'resetTransientState', true)
                 ], {trace:false});
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'revertChanges': function () {
                 return Clipperz.Async.callbacks("User.Header.RecordIndex.revertChanges", [
                         MochiKit.Base.method(this, 'recordsData'),
                         MochiKit.Base.methodcaller('revertChanges'),
 
         //              MochiKit.Base.method(this, 'directLoginsData'),
         //              MochiKit.Base.methodcaller('revertChanges'),
 
                         MochiKit.Base.method(this, 'records'),
                         MochiKit.Base.bind(function (someRecords) {
                                         varrecordReference;
                                 
                                 for (recordReference in this.transientState().getValue('deleteRecordsReferences')) {
                                         this.recordsIndex()[recordReference] = this.transientState().getValue('deleteRecordsIndex' + '.' + recordReference);
                                         someRecords[recordReference] = this.transientState().getValue('deleteRecordsReferences' + '.' + recordReference);
                                 }
 
@@ -525,97 +509,96 @@ Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
         //this.directLoginsIndex()[newDirectLogin.reference()] = newDirectLoginIndexValue;
         //this.directLoginsData().setValue(this.directLoginsIndex()[newDirectLogin.reference()], {'record': this.recordsIndex()[aRecord.reference()]});
 
                                 
         //                      for (directLoginReference in this.transientState().getValue('deleteDirectLoginReferences')) {
         //                              someDirectLogins[directLoginReference] = this.transientState().getValue('deleteDirectLoginReferences' + '.' + recordReference);
         //                      }
 
                                 for (directLoginReference in this.transientState().getValue('newDirectLoginReferences')) {
         //                              this.directLoginsData().removeValue(this.directLoginsIndex()[directLoginReference]);
                                         delete this.directLoginsIndex()[directLoginReference];
                                 }
                         }, this),
 
                         MochiKit.Base.method(this, 'directLoginsData'),
                         MochiKit.Base.methodcaller('revertChanges'),
 
                         MochiKit.Base.method(this, 'resetTransientState', false)
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'prepareRemoteDataWithKey': function (aKey) {
         //      "records": {
         //              "index": {
         //                      "eeda70e0392261967bda71c3764da78989c45bbd2bb7be6b941b90f81d9b81b5": "0",
         //                      "13a5e52976337ab210903cd04872588e1b21fb72bc183e91aa25c494b8138551": "1",
         //                      ...
         //                      "465a067a0bd2b470fa834de5397e38494de0c7707938262fae3427932e219744": "18",
         //                      "4fd1dc2ca860b7fb47cef10a84edb3270da05510b0a30a6b0b083898712d4b9e": "19"
         //              },
         //              "data": "n+AzGEEQXaSRSY4d ... BDypotrXgPo94uHfoXvGFzwCn8w="
         //      },
         //      "directLogins": {
         //              "index": {
         //                      "61e87fdc4f1d9112e3b30c1f6812d095dcdb24f014c83319091eb6c9899ec348":"0",
         //                      "989593d4c48929f0c8f1581aa96969c622807e99619ed4732026e967530a68ad":"1",
         //                      ...
         //                      "cb9ae0bba1957075ccdbfd3b3481704d62087687a2ac7c411a4f07d444bde0f7":"17",
         //                      "7e1d069b7fa57c03bd7bf48807520feb953157834503aaff8c9d493f37dea69d":"18"
         //              },
         //              "data":"5YG9KKU/OZ5guUgFlms6k1 ... ZG/5Fn0uN+LoAsNfHm+EE62x"
         //      },
                 
                 var deferredResult;
                 var result;
 
-//console.log("recordsIndex", this.recordsIndex());
                 result = {};
 
                 deferredResult = new Clipperz.Async.Deferred("User.Header.RecordIndex.prepareRemoteDataWithKey", {trace:false});
                 deferredResult.collectResults({
                                 'index':MochiKit.Base.partial(MochiKit.Async.succeed, this.recordsIndex()),
                         'data': [
                                 MochiKit.Base.method(this.recordsData(), 'prepareRemoteDataWithKey', aKey),
                                 MochiKit.Base.itemgetter('data')
                         ]
                 });
                 deferredResult.addCallback(Clipperz.Async.setItem, result, 'records');
 
                 deferredResult.collectResults({
                                 'index':MochiKit.Base.partial(MochiKit.Async.succeed, this.directLoginsIndex()),
                         'data': [
                                 MochiKit.Base.method(this.directLoginsData(), 'prepareRemoteDataWithKey', aKey),
                                 MochiKit.Base.itemgetter('data')
                         ]
                 });
                 deferredResult.addCallback(Clipperz.Async.setItem, result, 'directLogins');
                 
                 deferredResult.addCallback(MochiKit.Async.succeed, result);
 
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'updateRecordKeyAndPrepareRemoteData': function (aRecord) {
                         varnewRecordKey;
                 var deferredResult;
                 
                 newRecordKey = Clipperz.PM.Crypto.randomKey();
 
                 deferredResult = new Clipperz.Async.Deferred("User.Header.RecordIndex.updateRecordKeyAndPrepareRemoteData", {trace:false});
                 deferredResult.addCallback(MochiKit.Base.method(aRecord, 'prepareRemoteDataWithKey', newRecordKey));
                 deferredResult.addCallbackPass(MochiKit.Base.method(this, 'setRecordKey', aRecord.reference(), newRecordKey));
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //.........................................................................
 
         'removeNewRecordWithNoChanges': function (aRecord) {
                 var deferredResult;
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
index 646ce21..fd18faf 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 
 
 //#############################################################################
 
 Clipperz.PM.DataModel.User = function (args) {
         args = args || {};
 
         Clipperz.PM.DataModel.User.superclass.constructor.apply(this, arguments);
 
         this._username = args.username || null;
         this._getPassphraseFunction = args.getPassphraseFunction || null;
 
         this._data = null;
 
         this._connection = null;
         this._connectionVersion = 'current';
 
         this._serverData = null;
         //this._serverLockValue = null;
         this._transientState = null;
 
         this._deferredLocks = {
                         'passphrase':           new MochiKit.Async.DeferredLock(),
                         'serverData':           new MochiKit.Async.DeferredLock(),
         //              'recordsIndex':                 new MochiKit.Async.DeferredLock(),
         //              'directLoginsIndex':new MochiKit.Async.DeferredLock()
         //              'preferences':          new MochiKit.Async.DeferredLock()
         //              'oneTimePasswords':     new MochiKit.Async.DeferredLock()
                 '__syntaxFix__': 'syntax fix'
         };
 
         return this;
 }
 
 Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 
         'toString': function () {
                 return "Clipperz.PM.DataModel.User - " + this.username();
         },
 
         //-------------------------------------------------------------------------
 
@@ -283,186 +281,184 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'lock': function () {
                 return Clipperz.Async.callbacks("User.lock", [
                         MochiKit.Base.method(this, 'deleteAllCleanTextData')
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'logout': function () {
                 return Clipperz.Async.callbacks("User.logout", [
                         MochiKit.Base.method(this, 'deleteAllCleanTextData'),
                         MochiKit.Base.method(this.connection(), 'logout')
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'headerFormatVersion': function(anHeader) {
                 var result;
                 
                 if (anHeader.charAt(0) == '{') {
                                 varheaderData;
                         
                         headerData = Clipperz.Base.evalJSON(anHeader);
                         result = headerData['version'];
                 } else {
                         result = 'LEGACY';
                 }
                 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'unpackServerData': function (someServerData) {
                 var unpackedData;
                 var headerVersion;
 
                         varrecordsIndex;
                 var preferences;
                 var oneTimePasswords;
 
-//console.log(">>> ***************** user.unpackServerData", someServerData);
         //      this.setServerLockValue(someServerData['lock']);
 
                 headerVersion = this.headerFormatVersion(someServerData['header']);
         
                 switch (headerVersion) {
                         case 'LEGACY':
                                         varlegacyHeader;
                                 
                                 legacyHeader = new Clipperz.PM.DataModel.User.Header.Legacy({
                                         'retrieveKeyFunction': MochiKit.Base.method(this, 'getPassphrase'),
                                         'remoteData': {
                                                 'data': someServerData['header'],
                                                 'version': someServerData['version'],
                                                 'recordsStats': someServerData['recordsStats']
                                         },
         //                                      'encryptedDataKeypath':                 'data',
         //                                      'encryptedVersionKeypath':      'version',
                                                 'retrieveRecordDetailFunction':MochiKit.Base.method(this, 'getRecordDetail')
                                 });
 
                                         recordsIndex    = legacyHeader;
                                         preferences             = legacyHeader;
                                         oneTimePasswords= legacyHeader;
                                 break;
                         case '0.1':
                                         varheaderData;
                                 
                                 headerData = Clipperz.Base.evalJSON(someServerData['header']);
 
                                 recordsIndex = new Clipperz.PM.DataModel.User.Header.RecordIndex({
                                                 'retrieveKeyFunction':          MochiKit.Base.method(this, 'getPassphrase'),
                                                 'recordsData':                          headerData['records'],
                                                 'recordsStats':                                 someServerData['recordsStats'],
                                                 'directLoginsData':                     headerData['directLogins'],
                                                 'encryptedDataVersion':                 someServerData['version'],
                                                 'retrieveRecordDetailFunction':MochiKit.Base.method(this, 'getRecordDetail')
                                 });
 
                                         //Still missing a test case that actually fais with the old version of the code, where the check for undefined was missing
                                 if (typeof(headerData['preferences']) != 'undefined') {
                                                 preferences= new Clipperz.PM.DataModel.User.Header.Preferences({
                                                         'name':'preferences',
                                                 'retrieveKeyFunction': MochiKit.Base.method(this, 'getPassphrase'),
                                                 'remoteData': {
                                                         'data': headerData['preferences']['data'],
                                                         'version': someServerData['version']
                                                 }
                                         });
                                 } else {
                                                 preferences= new Clipperz.PM.DataModel.User.Header.Preferences({
                                                         'name':'preferences',
                                                 'retrieveKeyFunction': MochiKit.Base.method(this, 'getPassphrase')
                                         });
                                 }
 
                                 if (typeof(headerData['oneTimePasswords']) != 'undefined') {
                                         oneTimePasswords = new Clipperz.PM.DataModel.User.Header.OneTimePasswords({
                                                         'name':'preferences',
                                                 'retrieveKeyFunction': MochiKit.Base.method(this, 'getPassphrase'),
                                                 'remoteData': {
                                                         'data': headerData['oneTimePasswords']['data'],
                                                         'version': someServerData['version']
                                                 }
                                         });
                                 } else {
                                         oneTimePasswords = new Clipperz.PM.DataModel.User.Header.OneTimePasswords({
                                                         'name':'preferences',
                                                 'retrieveKeyFunction': MochiKit.Base.method(this, 'getPassphrase')
                                         });
                                 }
                                 
                                 break;
                 }
 
                 unpackedData = {
                         'version': someServerData['version'],
                         'statistics': someServerData['statistics'],
                         'header': {
                                 'data': someServerData['header'],
                                 'version': headerVersion,
                                 
                                 'recordsIndex': recordsIndex,
                                 'preferences': preferences,
                                 'oneTimePasswords': oneTimePasswords
                         }
                 };
 
                 this._serverData = unpackedData;
-//console.log("<<< ***************** user.unpackServerData", this._serverData);
                 
                 return this._serverData;
         },
 
         //-------------------------------------------------------------------------
 
         'getServerData': function() {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("User.getServerData", {trace:false});
                 deferredResult.acquireLock(this.deferredLockForSection('serverData'));
                 deferredResult.addCallback(MochiKit.Base.bind(function(aResult) {
                         var innerDeferredResult;
                 
                         innerDeferredResult = new Clipperz.Async.Deferred("User.getUserDetails.innerDeferred", {trace:false});
                         if (this._serverData == null) {
                                 innerDeferredResult.addCallbackPass(MochiKit.Signal.signal, this, 'loadingUserDetails');
                                 innerDeferredResult.addMethod(this.connection(), 'message', 'getUserDetails');
                                 innerDeferredResult.addMethod(this, 'unpackServerData');
                                 innerDeferredResult.addCallbackPass(MochiKit.Signal.signal, this, 'loadedUserDetails');
                         }
 
                         innerDeferredResult.addCallback(MochiKit.Base.bind(function () {
                                 return this._serverData;
                         },this));
                         innerDeferredResult.callback();
 
                         return innerDeferredResult;
                 }, this));
                 deferredResult.releaseLock(this.deferredLockForSection('serverData'));
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'connectionVersion': function() {
                 return this._connectionVersion;
         },
         
         'setConnectionVersion': function(aValue) {
                 if (this._connectionVersion != aValue) {
                         this.resetConnection();
                 }
                 this._connectionVersion = aValue;
         },
 
diff --git a/frontend/gamma/js/Clipperz/PM/Date.js b/frontend/gamma/js/Clipperz/PM/Date.js
index 96a2700..a62857e 100644
--- a/frontend/gamma/js/Clipperz/PM/Date.js
+++ b/frontend/gamma/js/Clipperz/PM/Date.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Date) == 'undefined') { Clipperz.PM.Date = {}; }
 
 Clipperz.PM.Date.VERSION = "0.1";
 Clipperz.PM.Date.NAME = "Clipperz.PM.Date";
 
 MochiKit.Base.update(Clipperz.PM.Date, {
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
 
         'locale': function() {
                 return {
                                 'amDesignation':Clipperz.PM.Strings.getValue('calendarStrings.amDesignation'),
                                 'pmDesignation':Clipperz.PM.Strings.getValue('calendarStrings.pmDesignation'),
                                 'days':                         Clipperz.PM.Strings.getValue('calendarStrings.days'),
                                 'shortDays':    Clipperz.PM.Strings.getValue('calendarStrings.shortDays'),
                                 'shortMonths':  Clipperz.PM.Strings.getValue('calendarStrings.shortMonths'),
                                 'months':               Clipperz.PM.Strings.getValue('calendarStrings.months')
                 }
         },
         
         //=========================================================================
 /*
         'formatDateWithPHPLikeTemplate': function(aDate, aTemplate) {
                 return Clipperz.Date.formatDateWithPHPLikeTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale());
         },
 
         'parseDateWithPHPLikeTemplate': function(aDate, aTemplate) {
                 return Clipperz.Date.parseDateWithPHPTemplateAndLocale(aDate, aTemplate, Clipperz.PM.Date.locale());
         },
 
         //=========================================================================
 
         'formatDateWithJavaLikeTemplate': function(aDate, aTemplate) {
diff --git a/frontend/gamma/js/Clipperz/PM/PIN.js b/frontend/gamma/js/Clipperz/PM/PIN.js
index bc932b2..a32889a 100644
--- a/frontend/gamma/js/Clipperz/PM/PIN.js
+++ b/frontend/gamma/js/Clipperz/PM/PIN.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.PIN) == 'undefined') { Clipperz.PM.PIN = {}; }
 
 MochiKit.Base.update(Clipperz.PM.PIN, {
 
         //-------------------------------------------------------------------------
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         'CREDENTIALS':   'CLIPPERZ.CREDENTIALS',
         'FAILURE_COUNT': 'CLIPPERZ.FAILED_LOGIN_COUNT',
         'ALLOWED_RETRY': 3,
 
         //-------------------------------------------------------------------------
 
         'isSet': function () {
                 return (this.storedCredentials() != null);
         },
 
         'storedCredentials': function () {
                 return localStorage[this.CREDENTIALS];
         },
 
         //-------------------------------------------------------------------------
 
         'recordFailedAttempt': function () {
                         varfailureCount;
                         varresult;
 
                 failureCount = localStorage[this.FAILURE_COUNT];
 
                 if (failureCount == null) {
                         failureCount = 0
                 }
 
                 failureCount ++;
diff --git a/frontend/gamma/js/Clipperz/PM/Proxy.js b/frontend/gamma/js/Clipperz/PM/Proxy.js
index 190bffd..a5eaae6 100644
--- a/frontend/gamma/js/Clipperz/PM/Proxy.js
+++ b/frontend/gamma/js/Clipperz/PM/Proxy.js
@@ -1,166 +1,158 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 //=============================================================================
 
 Clipperz.PM.Proxy = function(args) {
         args = args || {};
 
         this._shouldPayTolls = args.shouldPayTolls || false;
 
         this._tolls = {
                         'CONNECT':[],
                         'REGISTER':[],
                         'MESSAGE':[]
         };
 
         if (args.isDefault === true) {
                 Clipperz.PM.Proxy.defaultProxy = this;
         }
 
         return this;
 }
 
 Clipperz.PM.Proxy.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Clipperz.PM.Proxy";
         },
 
         //=========================================================================
 
         'shouldPayTolls': function() {
                 return this._shouldPayTolls;
         },
 
         //-------------------------------------------------------------------------
 
         'tolls': function() {
                 return this._tolls;
         },
 
         //-------------------------------------------------------------------------
 
         'payToll': function(aRequestType, someParameters) {
                         vardeferredResult;
 
-//console.log(">>> Proxy.payToll", aRequestType, someParameters);
                 if (this.shouldPayTolls()) {
                         deferredResult = new Clipperz.Async.Deferred("Proxy.payToll", {trace:false});
 
                         if (this.tolls()[aRequestType].length == 0) {
                                 deferredResult.addMethod(this, 'sendMessage', 'knock', {requestType:aRequestType});
                                 deferredResult.addMethod(this, 'setTollCallback');
                         }
                         deferredResult.addMethod(this.tolls()[aRequestType], 'pop');
                         deferredResult.addCallback(MochiKit.Base.methodcaller('deferredPay'));
                         deferredResult.addCallback(function(aToll) {
                                 var result;
                         
                                 result = {
                                         parameters: someParameters,
                                         toll: aToll
                                 }
                                 
                                 return result;
                         });
                 
                         deferredResult.callback();
                 } else {
                         deferredResult = MochiKit.Async.succeed({parameters:someParameters});
                 }
-//console.log("<<< Proxy.payToll");
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'addToll': function(aToll) {
-//console.log(">>> Proxy.addToll", aToll);
                 this.tolls()[aToll.requestType()].push(aToll);
-//console.log("<<< Proxy.addToll");
         },
 
         //=========================================================================
 
         'setTollCallback': function(someParameters) {
-//console.log(">>> Proxy.setTollCallback", someParameters);
                 if (typeof(someParameters['toll']) != 'undefined') {
-//console.log("added a new toll", someParameters['toll']);
                         this.addToll(new Clipperz.PM.Toll(someParameters['toll']));
                 }
-//console.log("<<< Proxy.setTallCallback", someParameters['result']);
+
                 return someParameters['result'];
         },
 
         //=========================================================================
 
         'registration': function (someParameters) {
                 return this.processMessage('registration', someParameters, 'REGISTER');
         },
 
         'handshake': function (someParameters) {
                 return this.processMessage('handshake', someParameters, 'CONNECT');
         },
 
         'message': function (someParameters) {
                 return this.processMessage('message', someParameters, 'MESSAGE');
         },
 
         'logout': function (someParameters) {
                 return this.processMessage('logout', someParameters, 'MESSAGE');
         },
 
         //=========================================================================
 
         'processMessage': function (aFunctionName, someParameters, aRequestType) {
                         vardeferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("Proxy.processMessage", {trace:false});
                 deferredResult.addMethod(this, 'payToll', aRequestType);
                 deferredResult.addMethod(this, 'sendMessage', aFunctionName);
                 deferredResult.addMethod(this, 'setTollCallback');
                 deferredResult.callback(someParameters);
                 
                         return deferredResult;  
         },
 
         //=========================================================================
 
         'sendMessage': function () {
                         throw Clipperz.Base.exception.AbstractMethod;   
         },
 
         //=========================================================================
 
         'isReadOnly': function () {
                 return false;
         },
 
         //=========================================================================
diff --git a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.JSON.js b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.JSON.js
index 5b39b4a..7d10dd4 100755
--- a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.JSON.js
+++ b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.JSON.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 //=============================================================================
 
 Clipperz.PM.Proxy.JSON = function(args) {
         Clipperz.PM.Proxy.JSON.superclass.constructor.call(this, args);
 
         this._url = args.url || Clipperz.Base.exception.raise('MandatoryParameter');
         
         return this;
 }
 
 Clipperz.Base.extend(Clipperz.PM.Proxy.JSON, Clipperz.PM.Proxy, {
 
         'toString': function() {
                 return "Clipperz.PM.Proxy.JSON";
         },
 
         //=========================================================================
 
         'url': function () {
                 return this._url;
         },
 
         //=========================================================================
         
         'sendMessage': function(aFunctionName, someParameters) {
                         vardeferredResult;
                 var parameters;
                 
                 parameters = {
                         method: aFunctionName,
         //              version: someParameters['version'],
         //              message: someParameters['message'],
                         parameters: Clipperz.Base.serializeJSON(someParameters)
                 };
 
                 deferredResult = new Clipperz.Async.Deferred("Proxy.JSON.sendMessage", {trace:false});
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'remoteRequestSent');
                 deferredResult.addCallback(MochiKit.Async.doXHR, this.url(), {
                         method:'POST',
                         sendContent:MochiKit.Base.queryString(parameters),
                         headers:{"Content-Type":"application/x-www-form-urlencoded"}
                 });
diff --git a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
index 01ba122..326022c 100644
--- a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
+++ b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
@@ -1,173 +1,169 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 try { if (typeof(Clipperz.PM.Proxy.Offline) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.PM.Proxy.Offline.DataStore depends on Clipperz.PM.Proxy.Offline!";
 }  
 
 //=============================================================================
 
 Clipperz.PM.Proxy.Offline.DataStore = function(args) {
         args = args || {};
         
         this._data = args.data || (typeof(_clipperz_dump_data_) != 'undefined' ? _clipperz_dump_data_ : null);
         this._isReadOnly = (typeof(args.readOnly) == 'undefined' ? true : args.readOnly);
         this._shouldPayTolls = args.shouldPayTolls || false;
 
         this._tolls = {};
         this._currentStaticConnection = null;
         
         return this;
 }
 
 Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
 
         //-------------------------------------------------------------------------
 
         'isReadOnly': function () {
                 return this._isReadOnly;
         },
         
         //-------------------------------------------------------------------------
 
         'shouldPayTolls': function() {
                 return this._shouldPayTolls;
         },
 
         //-------------------------------------------------------------------------
 
         'data': function () {
                 return this._data;
         },
 
         //-------------------------------------------------------------------------
 
         'tolls': function () {
                 return this._tolls;
         },
 
         //=========================================================================
 
         'resetData': function() {
                 this._data = {
                         'users': {
                                 'catchAllUser': {
                                         __masterkey_test_value__: 'masterkey',
                                         s: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00',
                                         v: '112233445566778899aabbccddeeff00112233445566778899aabbccddeeff00'
                                 }
                         }
                 };
         },
 
         //-------------------------------------------------------------------------
 
         'setupWithEncryptedData': function(someData) {
                 this._data = Clipperz.Base.deepClone(someData);
         },
 
         //-------------------------------------------------------------------------
 
         'setupWithData': function(someData) {
                 var deferredResult;
                 var resultData;
                 var i, c;
 
 //Clipperz.log(">>> Proxy.Test.setupWithData");
                 resultData = this._data;
 
                 deferredResult = new Clipperz.Async.Deferred("Proxy.Test.seupWithData", {trace:false});
                 c = someData['users'].length;
 
                 for (i=0; i<c; i++) {
                                 varnewConnection;
                                 varrecordConfiguration;
 
                         deferredResult.addMethod(this, 'userSerializedEncryptedData', someData['users'][i]);
                         deferredResult.addCallback(MochiKit.Base.bind(function(aUserSerializationContext) {
-//console.log("SERIALIZED USER", aUserSerializationContext);
                                 resultData['users'][aUserSerializationContext['credentials']['C']] = {
                                                 's':    aUserSerializationContext['credentials']['s'],
                                                 'v':    aUserSerializationContext['credentials']['v'],
                                                 'version':                      aUserSerializationContext['data']['connectionVersion'],
                                                 'userDetails':          aUserSerializationContext['encryptedData']['user']['header'],
                                                 'userDetailsVersion':aUserSerializationContext['encryptedData']['user']['version'],
                                                 'statistics':           aUserSerializationContext['encryptedData']['user']['statistics'],
                                                 'lock':                                 aUserSerializationContext['encryptedData']['user']['lock'],
                                                 'records':                      this.rearrangeRecordsData(aUserSerializationContext['encryptedData']['records'])
                                 }
                         }, this));
                 }
                 
                 deferredResult.addCallback(MochiKit.Base.bind(function() {
-//console.log("this._data", resultData);
                         this._data = resultData;
                 }, this));
                 
                 deferredResult.callback();
 //Clipperz.log("<<< Proxy.Test.setupWithData");
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'getTollForRequestType': function (aRequestType) {
                         varresult;
                         vartargetValue;
                 var cost;
                 
                 targetValue = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(32).toHexString().substring(2);
                 switch (aRequestType) {
                         case 'REGISTER':
                                 cost = 5;
                                 break;
                         case 'CONNECT':
                                 cost = 5;
                                 break;
                         case 'MESSAGE':
                                 cost = 2;
                                 break;
                 }
                 
                 result = {
                                 requestType: aRequestType,
                                 targetValue: targetValue,
                                 cost: cost
                 }
 
                 if (this.shouldPayTolls()) {
                         this.tolls()[targetValue] = result;
                 }
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'checkToll': function (aFunctionName, someParameters) {
                 if (this.shouldPayTolls()) {
                         var localToll;
                                 vartollParameters;
@@ -350,97 +346,97 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
                         S = (A.multiply(v.powerModule(u, Clipperz.Crypto.SRP.n()))).powerModule(aConnection['b'], Clipperz.Crypto.SRP.n());
 
                         K = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(S.asString(10))).toHexString().slice(2);
 
                         M1 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + aConnection['B'].asString(10) + K)).toHexString().slice(2);
                         if (someParameters.parameters.M1 == M1) {
                                 var M2;
                                 
                                 M2 = Clipperz.PM.Crypto.encryptingFunctions.versions[someParameters.version].hash(new Clipperz.ByteArray(A.asString(10) + someParameters.parameters.M1 + K)).toHexString().slice(2);
                                 result['M2'] = M2;
                         } else {
                                 throw new Error("Client checksum verification failed! Expected <" + M1 + ">, received <" + someParameters.parameters.M1 + ">.", "Error");
                         }
 
                         nextTollRequestType = 'MESSAGE';
                 } else if (someParameters.message == "oneTimePassword") {
                         var otpData;
                         
                         otpData = this.data()['onetimePasswords'][someParameters.parameters.oneTimePasswordKey];
 
                         try {
                                 if (typeof(otpData) != 'undefined') {
                                         if (otpData['status'] == 'ACTIVE') {
                                                 if (otpData['key_checksum'] == someParameters.parameters.oneTimePasswordKeyChecksum) {
                                                         result = {
                                                                         'data':         otpData['data'],
                                                                         'version':otpData['version']
                                                         }
 
                                                         otpData['status'] = 'REQUESTED';
                                                 } else {
                                                         otpData['status'] = 'DISABLED';
                                                         throw "The requested One Time Password has been disabled, due to a wrong keyChecksum";
                                                 }
                                         } else {
                                                 throw "The requested One Time Password was not active";
                                         }
                                 } else {
                                         throw "The requested One Time Password has not been found"
                                 }
                         } catch (exception) {
                                 result = {
                                                 'data':         Clipperz.PM.Crypto.randomKey(),
                                                 'version':Clipperz.PM.Connection.communicationProtocol.currentVersion
                                 }
                         }
                         nextTollRequestType = 'CONNECT';
                 } else {
-                        MochiKit.Logging.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message);
+                        Clipperz.logError("Clipperz.PM.Proxy.Test.handshake - unhandled message: " + someParameters.message);
                 }
 
                 result = {
                         result: result,
                         toll:   this.getTollForRequestType(nextTollRequestType)
                 }
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         '_message': function(aConnection, someParameters) {
                 var result;
 
                 result = {};
 
                 //=====================================================================
                 //
                         //              R       E       A       D       -       O       N       L       Y       M e t h o d s
                 //
                 //=====================================================================
                 if (someParameters.message == 'getUserDetails') {
                         var recordsStats;
                         var recordReference;
 
                         recordsStats = {};
                         for (recordReference in aConnection['userData']['records']) {
                                 recordsStats[recordReference] = {
                                         'updateDate': aConnection['userData']['records'][recordReference]['updateDate']
                                 }
                         }
 
                         result['header'] =  this.userDetails(aConnection);
                         result['statistics'] = this.statistics(aConnection);
                         result['maxNumberOfRecords'] = aConnection['userData']['maxNumberOfRecords'];
                         result['version'] = aConnection['userData']['userDetailsVersion'];
                         result['recordsStats'] = recordsStats;
                         
                         if (this.isReadOnly() == false) {
                                         varlock;
                                 
                                 if (typeof(aConnection['userData']['lock']) == 'undefined') {
                                         aConnection['userData']['lock'] = "<<LOCK>>";
                                 }
                                 
                                 result['lock'] = aConnection['userData']['lock'];
                         }
@@ -480,325 +476,309 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
                 //=====================================================================
                 //
                         //              R       E       A       D       -       W       R       I       T       E       M e t h o d s
                 //
                 //=====================================================================
                 } else if (someParameters.message == 'upgradeUserCredentials') {
                         if (this.isReadOnly() == false) {
                                 var parameters;
                                 var credentials;
 
                                 parameters = someParameters['parameters'];
                                 credentials = parameters['credentials'];
 
                                 if ((credentials['C'] == null)
                                         ||(credentials['s'] == null)
                                         ||(credentials['v'] == null)
                                         ||(credentials['version'] != Clipperz.PM.Connection.communicationProtocol.currentVersion)
                                 ) {
                                         result = Clipperz.PM.DataModel.User.exception.CredentialUpgradeFailed;
                                 } else {
                                                 varoldCValue;
                                         oldCValue = aConnection['C'];
 
                                         this.data()['users'][credentials['C']] = aConnection['userData'];
                                         aConnection['C'] = credentials['C'];
 
                                         aConnection['userData']['s'] = credentials['s'];
                                         aConnection['userData']['v'] = credentials['v'];
                                         aConnection['userData']['version'] = credentials['version'];
 
                                         aConnection['userData']['userDetails'] = parameters['user']['header'];
                                         aConnection['userData']['userDetailsVersion'] = parameters['user']['version'];
                                         aConnection['userData']['statistics'] = parameters['user']['statistics'];
 
                                         aConnection['userData']['lock'] = parameters['user']['lock'];
                                         
                                         delete this.data()['users'][oldCValue];
 
                                         result = {result:"done", parameters:parameters};
                                 }
                         } else {
                                 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
                         }
                 //=====================================================================
         /*      } else if (someParameters.message == 'updateData') {
                         if (this.isReadOnly() == false) {
                                 var i, c;
 
-//console.log("###===============================================================");
-//console.log("###>>>", Clipperz.Base.serializeJSON(someParameters));
-//console.log("###--- userData", Clipperz.Base.serializeJSON(this.userData()));
                                         if (this.userData()['lock']!= someParameters['parameters']['user']['lock']) {
                                         throw "the lock attribute is not processed correctly"
                                 }
 
                                         this.userData()['userDetails']          = someParameters['parameters']['user']['header'];
                                         this.userData()['statistics']           = someParameters['parameters']['user']['statistics'];
                                         this.userData()['userDetailsVersions']= someParameters['parameters']['user']['version'];
 
                                 c = someParameters['parameters']['records'].length;
                                 for (i=0; i<c; i++) {
                                         var currentRecord;
                                         var currentRecordData;
 
                                         currentRecordData = someParameters['parameters']['records'][i];
                                         currentRecord = this.userData()['records'][currentRecordData['record']['reference']];
                                         
                                         if (currentRecord == null) {
                                         }
                                         
                                         currentRecord['data'] = currentRecordData['record']['data'];
                                         currentRecord['version'] = currentRecordData['record']['version'];
                                         currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference'];
                                         
                                         currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = {
                                                         'data':                                 currentRecordData['currentRecordVersion']['data'],
                                                         'version':                      currentRecordData['currentRecordVersion']['version'],
                                                         'previousVersion':      currentRecordData['currentRecordVersion']['previousVersion'],
                                                         'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey']
                                         }
                                 }
 
                                 this.userData()['lock'] = Clipperz.PM.Crypto.randomKey();
                                 result['lock'] = this.userData()['lock'];
                                 result['result'] = 'done';
-//console.log("###<<< userData", Clipperz.Base.serializeJSON(this.userData()));
                         } else {
                                 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
                         }
         */      //=====================================================================
                 } else if (someParameters.message == 'saveChanges') {
                         if (this.isReadOnly() == false) {
                                 var i, c;
 
-//console.log("###===============================================================");
-//console.log("###>>>", someParameters);
-//console.log("###>>>", Clipperz.Base.serializeJSON(someParameters));
-//console.log("###--- userData", Clipperz.Base.serializeJSON(this.userData()));
-//console.log("###===============================================================");
-//console.log("--- userData.lock  ", this.userData()['lock']);
-//console.log("--- parameters.lock", someParameters['parameters']['user']['lock']);
                                         if (aConnection['userData']['lock']!= someParameters['parameters']['user']['lock']) {
                                         throw "the lock attribute is not processed correctly"
                                 }
 
                                         aConnection['userData']['userDetails']          = someParameters['parameters']['user']['header'];
                                         aConnection['userData']['statistics']           = someParameters['parameters']['user']['statistics'];
                                         aConnection['userData']['userDetailsVersions']= someParameters['parameters']['user']['version'];
 
                                 c = someParameters['parameters']['records']['updated'].length;
                                 for (i=0; i<c; i++) {
                                         var currentRecord;
                                         var currentRecordData;
 
                                         currentRecordData = someParameters['parameters']['records']['updated'][i];
                                         currentRecord = aConnection['userData']['records'][currentRecordData['record']['reference']];
 
                                         if (
                                                 (typeof(aConnection['userData']['records'][currentRecordData['record']['reference']]) == 'undefined')
                                                 &&
                                                 (typeof(currentRecordData['currentRecordVersion']) == 'undefined')
                                         ) {
-//console.log("######## SHIT HAPPENS");
                                                 throw "Record added without a recordVersion";
                                         }
 
                                         if (currentRecord == null) {
                                                 currentRecord = {};
                                                 currentRecord['versions'] = {};
                                                         currentRecord['creationDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
                                                         currentRecord['accessDate']     = Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
 
                                                 aConnection['userData']['records'][currentRecordData['record']['reference']] = currentRecord;
                                         }
                                         
                                                 currentRecord['data']   = currentRecordData['record']['data'];
                                                 currentRecord['version']= currentRecordData['record']['version'];
                                                 currentRecord['updateDate']= Clipperz.PM.Date.formatDateWithUTCFormat(new Date());
 
                                         if (typeof(currentRecordData['currentRecordVersion']) != 'undefined') {
                                                 currentRecord['currentVersion'] = currentRecordData['currentRecordVersion']['reference'];
                                                 currentRecord['versions'][currentRecordData['currentRecordVersion']['reference']] = {
                                                                 'data':                                 currentRecordData['currentRecordVersion']['data'],
                                                                 'version':                      currentRecordData['currentRecordVersion']['version'],
                                                                 'previousVersion':      currentRecordData['currentRecordVersion']['previousVersion'],
                                                                 'previousVersionKey':currentRecordData['currentRecordVersion']['previousVersionKey'],
                                                                 'creationDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
                                                                 'updateDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date()),
                                                                 'accessDate':Clipperz.PM.Date.formatDateWithUTCFormat(new Date())
                                                 }
                                         }
                                 }
 
                                 c = someParameters['parameters']['records']['deleted'].length;
                                 for (i=0; i<c; i++) {
                                         var currentRecordReference;
 
                                         currentRecordReference = someParameters['parameters']['records']['deleted'][i];
-//console.log("DELETING records", currentRecordReference);
                                         delete aConnection['userData']['records'][currentRecordReference];
                                 }
 
                                 aConnection['userData']['lock'] = Clipperz.PM.Crypto.randomKey();
                                 result['lock'] = aConnection['userData']['lock'];
                                 result['result'] = 'done';
-//console.log("###<<< userData", Clipperz.Base.serializeJSON(this.userData()));
                         } else {
                                 throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
                         }
 
                 //=====================================================================
                 //
                         //              U       N       H       A       N       D       L       E       D       M e t h o d
                 //
                 //=====================================================================
                 } else {
-                        MochiKit.Logging.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message);
+                        Clipperz.logError("Clipperz.PM.Proxy.Test.message - unhandled message: " + someParameters.message);
                 }
         
                 result = {
                         result: result,
                         toll:   this.getTollForRequestType('MESSAGE')
                 }
 
         //      return MochiKit.Async.succeed(result);
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         '_logout': function(someParameters) {
         //      return MochiKit.Async.succeed({result: 'done'});
                 return {result: 'done'};
         },
 
         //=========================================================================
         //#########################################################################
 
         'isTestData': function(aConnection) {
                 return (typeof(aConnection['userData']['__masterkey_test_value__']) != 'undefined');
         },
 
         'userDetails': function(aConnection) {
                 var result;
                 
                 if (this.isTestData(aConnection)) {
                         var serializedHeader;
                         var version;
 
-//MochiKit.Logging.logDebug("### test data");
+//Clipperz.logDebug("### test data");
                         version = aConnection['userData']['userDetailsVersion'];
                         serializedHeader = Clipperz.Base.serializeJSON(aConnection['userData']['userDetails']);
                         result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedHeader);
                 } else {
-//MochiKit.Logging.logDebug("### NOT test data");
+//Clipperz.logDebug("### NOT test data");
                         result = aConnection['userData']['userDetails'];
                 }
                 
                 return result;
         },
         
         'statistics': function(aConnection) {
                 var result;
 
                 if (aConnection['userData']['statistics'] != null) {
                         if (this.isTestData(aConnection)) {
                                 var serializedStatistics;
                                 var version;
 
                                 version = aConnection['userData']['userDetailsVersion'];
                                 serializedStatistics = Clipperz.Base.serializeJSON(aConnection['userData']['statistics']);
                                 result = Clipperz.PM.Crypto.encryptingFunctions.versions[version].encrypt(aConnection['userData']['__masterkey_test_value__'], serializedStatistics);
                         } else {
                                  result = aConnection['userData']['statistics'];
                         }
                 } else {
                         result = null;
                 }
                 
                 return result;
         },
 
 /*
         'userSerializedEncryptedData': function(someData) {
                 var deferredResult;
                 var deferredContext;
                 
                 deferredContext = { 'data': someData };
                 
                 deferredResult = new Clipperz.Async.Deferred('Proxy.Test.serializeUserEncryptedData', {trace:false});
                 deferredResult.addCallback(MochiKit.Base.bind(function(aDeferredContext) {
                         aDeferredContext['user'] = this.createUserUsingConfigurationData(aDeferredContext['data']);
                         return aDeferredContext;
                 }, this));
                 deferredResult.addCallback(function(aDeferredContext) {
         //              return aDeferredContext['user'].encryptedDataUsingVersion(aDeferredContext['data']['version']);
                         return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']);
                 });
                 deferredResult.addCallback(function(aUserEncryptedData) {
                         deferredContext['encryptedData'] = aUserEncryptedData;
                         return deferredContext;
                 });
                 deferredResult.addCallback(function(aDeferredContext) {
                         var connection;
 
                         connection = new Clipperz.PM.Connection.communicationProtocol.versions[aDeferredContext['data']['connectionVersion']]()
                         aDeferredContext['credentials'] = connection.serverSideUserCredentials(aDeferredContext['user'].username(),aDeferredContext['user'].passphrase());
 
                         return aDeferredContext;
                 });
 
         //      deferredResult.addCallback(function(aDeferredContext) {
-//console.log("#-#-#-#-#", aDeferredContext);
         //              return aDeferredContext['user'].serializedDataUsingVersion(MochiKit.Base.values(aDeferredContext['user'].records()), aDeferredContext['data']['version']);
         //      }, deferredContext);
         //      deferredResult.addCallback(function(aUserSerializedData) {
-//console.log("USER SERIALIZED DATA", aUserSerializedData);
         //      });
 //
         //      deferredResult.addCallback(MochiKit.Async.succeed, deferredContext);
                 deferredResult.callback(deferredContext);
                 
                 return deferredResult;
         },
 
         'createUserUsingConfigurationData': function(someData) {
                 var result;
                 var user;
                 var recordLabel;
 
                 user = new Clipperz.PM.DataModel.User();
                 user.initForTests();
                 user.setUsername(someData['username']);
                 user.setPassphrase(someData['passphrase']);
 
                 for (recordLabel in someData['records']) {
                         var recordData;
                         var record;
                         var i, c;
                         
                         recordData = someData['records'][recordLabel];
                         record = new Clipperz.PM.DataModel.Record({user:user, label:recordLabel});
                         record.setNotes(recordData['notes']);
                         
                         c = recordData['fields'].length;
                         for (i=0; i<c; i++) {
                                 var recordField;
                                 
                                 recordField = new Clipperz.PM.DataModel.RecordField();
                                 recordField.setLabel(recordData['fields'][i]['name']);
                                 recordField.setValue(recordData['fields'][i]['value']);
                                 recordField.setType(recordData['fields'][i]['type']);
                                 record.addField(recordField);
                         }
                         user.addRecord(record, true);
                 }
                 
                 result = user;
                 
                 return result;
         },
 */
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.js b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.js
index a86ac4f..5764bda 100644
--- a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.js
+++ b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Offline.js
@@ -1,64 +1,62 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 //=============================================================================
 
 Clipperz.PM.Proxy.Offline = function(args) {
         args = args || {};
         
         Clipperz.PM.Proxy.Offline.superclass.constructor.call(this, args);
 
         this._dataStore = args.dataStore || new Clipperz.PM.Proxy.Offline.DataStore(args);
 
         return this;
 }
 
 Clipperz.Base.extend(Clipperz.PM.Proxy.Offline, Clipperz.PM.Proxy, {
 
         'toString': function () {
                 return "Clipperz.PM.Proxy.Offline";
         },
 
         //-------------------------------------------------------------------------
 
         'dataStore': function () {
                 return this._dataStore;
         },
 
         //-------------------------------------------------------------------------
 
         'sendMessage': function(aFunctionName, someParameters) {
                 return this.dataStore().processMessage(aFunctionName, someParameters);
         },
 
         //-------------------------------------------------------------------------
 
         __syntaxFix__: "syntax fix"
         
 });
 
diff --git a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.OfflineCache.js b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.OfflineCache.js
index 803c590..f628975 100644
--- a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.OfflineCache.js
+++ b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.OfflineCache.js
@@ -1,65 +1,63 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 //=============================================================================
 
 Clipperz.PM.Proxy.OfflineCache = function(args) {
         args = args || {};
         
         Clipperz.PM.Proxy.Offline.superclass.constructor.call(this, args);
 
         //this._dataStore = args.dataStore || new Clipperz.PM.Proxy.Offline.DataStore(args);
 
         return this;
 }
 
 Clipperz.Base.extend(Clipperz.PM.Proxy.OfflineCache, Clipperz.PM.Proxy, {
 
         'toString': function () {
                 return "Clipperz.PM.Proxy.OfflineCache";
         },
 
         //-------------------------------------------------------------------------
 
         //'dataStore': function () {
         //      return this._dataStore;
         //},
 
         //-------------------------------------------------------------------------
 
         'sendMessage': function(aFunctionName, someParameters) {
                         throw Clipperz.Base.exception.MethodNotImplementedYet;  
         //      return this.dataStore().processMessage(aFunctionName, someParameters);
         },
 
         //-------------------------------------------------------------------------
 
         __syntaxFix__: "syntax fix"
         
 });
 
diff --git a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Test.js b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Test.js
index d554c6a..d459726 100644
--- a/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Test.js
+++ b/frontend/gamma/js/Clipperz/PM/Proxy/Proxy.Test.js
@@ -1,164 +1,156 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Proxy) == 'undefined') { Clipperz.PM.Proxy = {}; }
 
 //=============================================================================
 
 Clipperz.PM.Proxy.Test = function(args) {
         Clipperz.PM.Proxy.Test.superclass.constructor.call(this, args);
 
         args = args || {};
 
         this._expectedRequests = (args.shouldCheckExpectedRequests === true) ? [] : null;
         this._isExpectingRequests = true;
         this._unexpectedRequests = [];
 
         this.dataStore().resetData();
 
         return this;
 }
 
 Clipperz.Base.extend(Clipperz.PM.Proxy.Test, Clipperz.PM.Proxy.Offline, {
 
         'toString': function() {
                 return "Clipperz.PM.Proxy.Test";
         },
 
         //=========================================================================
 
         'expectedRequests': function () {
                 return this._expectedRequests;
         },
 
         //-------------------------------------------------------------------------
 
         'shouldCheckExpectedRequests': function () {
                 return (this._expectedRequests != null);
         },
 
         'setShouldCheckExpectedRequests': function(aValue) {
                 if (aValue) {
                         this._expectedRequests = aValue;
                 } else {
                         this._expectedRequests = null;
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'shouldNotReceiveAnyFurtherRequest': function () {
                 this._isExpectingRequests = false;
         },
 
         'mayReceiveMoreRequests': function () {
                 this._isExpectingRequests = true;
                 this.resetUnexpectedRequests();
         },
 
         'isExpectingRequests': function () {
                 return this._isExpectingRequests;
         },
 
         //-------------------------------------------------------------------------
 
         'unexpectedRequests': function () {
                 return this._unexpectedRequests;
         },
 
         'resetUnexpectedRequests': function () {
                 this._unexpectedRequests = [];
         },
 
         //-------------------------------------------------------------------------
 
         'testExpectedRequestParameters': function (aPath, anActualRequest, anExpectedRequest) {
                 var aKey;
-//console.log(">>> Proxy.testExpectedRequestParameters [" + aPath  + "]", anActualRequest, anExpectedRequest);
                 for (aKey in anExpectedRequest) {
                         if (typeof(anActualRequest[aKey]) == 'undefined') {
                                 throw "the expected paramter [" + aKey + "] is missing from the actual request";
                         }
                         if (typeof(anExpectedRequest[aKey]) == 'object') {
                                 this.testExpectedRequestParameters(aPath + "." + aKey,  anActualRequest[aKey], anExpectedRequest[aKey])
                         } else {
                                 if (! anExpectedRequest[aKey](anActualRequest[aKey])) {
                                         throw "wrong value for paramter [" + aKey + "]; got '" + anActualRequest[aKey] + "'";
                                 }
                         }
                 }
-//console.log("<<< Proxy.testExpectedRequestParameters");
         },
 
         //-------------------------------------------------------------------------
 
         'checkRequest': function(aFunctionName, someParameters) {
                 if (this.shouldCheckExpectedRequests()) {
                         var expectedRequest;
 
-//console.log(">>> Proxy.Test.checkRequest - " + aFunctionName, someParameters);
                         expectedRequest = this.expectedRequests().pop();
-//console.log("--- Proxy.Test.checkRequest - expectedRequest", expectedRequest);
                         if (expectedRequest == null) {
                                 throw "Proxy.Test.sentMessage: no expected result specified. Got request '" + aFunctionName + "': " + someParameters;
                         }
 
                         try {
                                 if (aFunctionName != expectedRequest.functionName) {
                                         throw "wrong function name. Got '" + aFunctionName + "', expected '" + expectedRequest.request.functionName + "'";
                                 }
 
                                 this.testExpectedRequestParameters("parameters", someParameters, expectedRequest.parameters);
                         } catch(exception) {
-//console.log("EXCEPTION: Proxy.Test.sentMessage[" + expectedRequest.name + "]", exception)
                                 throw "Proxy.Test.sentMessage[" + expectedRequest.name + "]: " + exception;
                         }
                 }
-//console.log("<<< Proxy.Test.checkRequest");
         },
 
         //=========================================================================
 
         'sendMessage': function(aFunctionName, someParameters) {
                 var result;
 
                 if (this.isExpectingRequests() == false) {
         //              throw Clipperz.PM.Connection.exception.UnexpectedRequest;
 Clipperz.log("UNEXPECTED REQUEST " + aFunctionName /* + ": " + Clipperz.Base.serializeJSON(someParameters) */);
                         this.unexpectedRequests().push({'functionName':aFunctionName, 'someParameters': someParameters});
                 };
                 this.checkRequest(aFunctionName, someParameters);
                 result = Clipperz.PM.Proxy.Test.superclass.sendMessage.call(this, aFunctionName, someParameters);
 
                 return result;
         },
         
         //=========================================================================
         __syntaxFix__: "syntax fix"
         
 });
 
diff --git a/frontend/gamma/js/Clipperz/PM/Strings.js b/frontend/gamma/js/Clipperz/PM/Strings.js
index a051365..7e855ff 100644
--- a/frontend/gamma/js/Clipperz/PM/Strings.js
+++ b/frontend/gamma/js/Clipperz/PM/Strings.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; }
 if (typeof(Clipperz.PM.Strings.Languages) == 'undefined') { Clipperz.PM.Strings.Languages = {}; }
 
 //-----------------------------------------------------------------------------
 /*
 Clipperz.PM.Strings.standardStrings = {
                 'loginPanelSwitchLanguageSelectOptions':[
 / *
                 {tag:'option', html:"Arabic (Oman) (العربية)", value:'ar-OM', disabled:true},
                 {tag:'option', html:"Arabic (Syria) (العربية)", value:'ar-SY', disabled:true},
                 {tag:'option', html:"Bahasa Indonesia", value:'id-ID', disabled:true},
                 {tag:'option', html:"Bulgarian (Български)", value:'bg-BG', disabled:true},
                 {tag:'option', html:"Català", value:'ca-ES', disabled:true},
                 {tag:'option', html:"Chinese (Simplified) (简体中文)", value:'zh-CN', disabled:true},
                 {tag:'option', html:"Chinese (Traditional) (正體中文)", value:'zh-TW', disabled:true},
                 {tag:'option', html:"Czech (Česky)", value:'cs-CZ', disabled:true},
                 {tag:'option', html:"Dansk", value:'da-DK', disabled:true},
                 {tag:'option', html:"Deutsch", value:'de-DE'/ *, disabled:true* /},
                 {tag:'option', html:"English (American)", value:'en-US'/ *, disabled:true* /},
                 {tag:'option', html:"English (British)", value:'en-GB'/ *, disabled:true* /},
                 {tag:'option', html:"English (Canadian)", value:'en-CA'/ *, disabled:true* /},
                 {tag:'option', html:"Español", value:'es-ES', disabled:true},
                 {tag:'option', html:"Eesti", value:'et-EE', disabled:true},
                 {tag:'option', html:"Français", value:'fr-FR', disabled:true},
                 {tag:'option', html:"Galego", value:'gl-ES', disabled:true},
                 {tag:'option', html:"Greek (Ελληνικά)", value:'el-GR', disabled:true},
                 {tag:'option', html:"Íslenska", value:'is-IS', disabled:true},
                 {tag:'option', html:"Italiano", value:'it-IT'/ *, disabled:true* /},
                 {tag:'option', html:"Japanese (日本語)", value:'ja-JP', disabled:true},
                 {tag:'option', html:"Korean (한국어)", value:'ko-KR', disabled:true},
                 {tag:'option', html:"Latviešu", value:'lv-LV', disabled:true},
                 {tag:'option', html:"Lietuvių", value:'lt-LT', disabled:true},
                 {tag:'option', html:"Macedonian (Македонски)", value:'mk-MK', disabled:true},
                 {tag:'option', html:"Magyar", value:'hu-HU', disabled:true},
                 {tag:'option', html:"Nederlands", value:'nl-NL', disabled:true},
                 {tag:'option', html:"Norsk bokmål", value:'nb-NO', disabled:true},
                 {tag:'option', html:"Norsk nynorsk", value:'nn-NO', disabled:true},
                 {tag:'option', html:"Persian (Western) (فارسى)", value:'fa-IR', disabled:true},
                 {tag:'option', html:"Polski", value:'pl-PL', disabled:true},
                 {tag:'option', html:"Português", value:'pt-PT'/ *, disabled:true* /},
                 {tag:'option', html:"Português Brasileiro", value:'pt-BR'/ *, disabled:true* /},
                 {tag:'option', html:"Românä", value:'ro-RO', disabled:true},
                 {tag:'option', html:"Russian (Русский)", value:'ru-RU', disabled:true},
@@ -196,97 +194,92 @@ Clipperz.PM.Strings.Languages.setSelectedLanguage = function(aLanguage) {
         language = (aLanguage || Clipperz.PM.Strings.preferredLanguage || 'default').toLowerCase();
         if (typeof(Clipperz.PM.Strings.defaultLanguages[language]) != 'undefined') {
                 language = Clipperz.PM.Strings.defaultLanguages[language];
         }
 
         if (typeof(Clipperz.PM.Strings.Languages[language]) != 'undefined') {
                 selectedLanguage = language;
         } else if (typeof(Clipperz.PM.Strings.defaultLanguages[language.substr(0,2)]) != 'undefined') {
                 selectedLanguage = Clipperz.PM.Strings.defaultLanguages[language.substr(0,2)];
         } else {
                 selectedLanguage = Clipperz.PM.Strings.defaultLanguages['default'];
         }
         
         if (selectedLanguage != Clipperz.PM.Strings.selectedLanguage) {
                         vartranslations;
 
                 Clipperz.PM.Strings.selectedLanguage = selectedLanguage;
 
                 translations = {};
         //      MochiKit.Base.update(translations, Clipperz.PM.Strings.standardStrings)
 
                 MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.Languages['defaults']);
                 MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.GeneralSettings['defaults']);
 
                 MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.Languages[Clipperz.PM.Strings.defaultLanguages['default']]);
                 MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.GeneralSettings[Clipperz.PM.Strings.defaultLanguages['default']]);
 
                 MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.Languages[selectedLanguage]);
                 MochiKit.Base.updatetree(translations, Clipperz.PM.Strings.GeneralSettings[selectedLanguage]);
 
                 Clipperz.PM.Strings.stringsObjectStore = new Clipperz.KeyValueObjectStore(/*{'name':'String.stringsObjectStore [1]'}*/);
                 Clipperz.PM.Strings.stringsObjectStore.initWithValues(translations);
 
                 if (typeof(bookmarklet) != 'undefined') {
                         Clipperz.PM.Strings.stringsObjectStore.setValue('bookmarklet', Clipperz.PM.Strings.translateBookmarklet(bookmarklet));
                 }
 
                 MochiKit.Signal.signal(Clipperz.PM.Strings.Languages, 'switchLanguage', selectedLanguage);
         }
 }
 
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.Strings.getValue = function (aKeyPath, someKeyValues) {
                 varresult;
         
         result = Clipperz.PM.Strings.stringsObjectStore.getValue(aKeyPath);
 
-//try {
         if (typeof(result) == 'string') {
                 if (typeof (someKeyValues) != 'undefined') {
                                 varkey;
                 
                         for (key in someKeyValues) {
                                 result = result.replace( new RegExp(key), someKeyValues[key]);
-                //              result.replace(, '');
                         }
                 }
 
                 result = result.replace(new RegExp('\n'), '<br>');
         }
-//} catch (exception) {
-        //console.log("####", result, aKeyPath, someKeyValues, exception);
-//}
 
         return result;
 }
 
 Clipperz.PM.Strings.errorDescriptionForException = function (anException) {
         var result;
         
         result = Clipperz.PM.Strings.getValue('exceptionsMessages' + '.' + anException.name);
 
         if (result == null) {
                 result = anException.message;
         }
         
         return result;
 },
 
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.Strings.Languages.initSetup = function() {
                 varlanguage;
                 varlanguageParser;
 
                 language = navigator.language || navigator.userLanguage;        //en, en-US, .... "de", "nb-no"
         languageParser = new RegExp("language=([a-z]{2}(?:\-[a-z]{2})?)(\&|$)", "i");
         if (languageParser.test(window.location.search)) {
                 language = RegExp.$1;
         }
 
         Clipperz.PM.Strings.preferredLanguage = language.toLowerCase();
         Clipperz.PM.Strings.Languages.setSelectedLanguage(Clipperz.PM.Strings.preferredLanguage);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/PM/Strings/MessagePanelConfigurations.js b/frontend/gamma/js/Clipperz/PM/Strings/MessagePanelConfigurations.js
index 7f6c52f..7565d2d 100644
--- a/frontend/gamma/js/Clipperz/PM/Strings/MessagePanelConfigurations.js
+++ b/frontend/gamma/js/Clipperz/PM/Strings/MessagePanelConfigurations.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; }
 
 Clipperz.PM.Strings.messagePanelConfigurations = {
 
 
         //-------------------------------------------------------------------------
         //
         // Registration - connection
         //
         'registration_verify': function() {
                 return {
                         'title': null,
                         'text':  Clipperz.PM.Strings['connectionRegistrationSendingRequestMessageText']
                 }
         },
 
         'registration_sendingCredentials': function() {
                 return {
                         'title': null,
                         'text':  Clipperz.PM.Strings['connectionRegistrationSendingCredentialsMessageText']
                 }
         },
 
         //-------------------------------------------------------------------------
         //
         // One Time Password login message panel
         //
 
         'OTP_login_start': function() {
                 return  {
                         'title': Clipperz.PM.Strings['OTPloginMessagePanelInitialTitle'],
                         'text':  Clipperz.PM.Strings['OTPloginMessagePanelInitialText'],
                         'steps': '+3',
                         'buttons': {}
                 }
         },
 
         'OTP_login_loadingOTP': function() {
                 return {
                         'title': Clipperz.PM.Strings['OTPloginMessagePanelLoadingTitle'],
                         'text':  Clipperz.PM.Strings['OTPloginMessagePanelLoadingText']
                 }
         },
diff --git a/frontend/gamma/js/Clipperz/PM/Strings/Strings_defaults.js b/frontend/gamma/js/Clipperz/PM/Strings/Strings_defaults.js
index 101ed3f..aefd94a 100644
--- a/frontend/gamma/js/Clipperz/PM/Strings/Strings_defaults.js
+++ b/frontend/gamma/js/Clipperz/PM/Strings/Strings_defaults.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; }
 if (typeof(Clipperz.PM.Strings.Languages) == 'undefined') { Clipperz.PM.Strings.Languages = {}; }
 
 //=============================================================================
 //
         //      D E F A U L T S  ( defaults )
 //
 //=============================================================================
 
 Clipperz.PM.Strings.Languages['defaults'] = {
 
 'elapsedTimeDescriptions': {
                 'MORE_THAN_A_MONTH_AGO':        "more than a month ago",
                 'MORE_THAN_A_WEEK_AGO':                 "more than a week ago",
                 'MORE_THAN_*_WEEKS_AGO':        "more than __elapsed__ weeks ago",
                 'YESTERDAY':                            "yesterday",
                 '*_DAYS_AGO':                           "__elapsed__ days ago",
                 'ABOUT_AN_HOUR_AGO':            "about an hour ago",
                 '*_HOURS_AGO':                          "__elapsed__ hours ago",
                 'JUST_A_FEW_MINUTES_AGO':       "just a few minutes ago",
                 'ABOUT_*_MINUTES_AGO':          "about __elapsed__ minutes ago"
 },
 /*
         'unknown_ip':                                   "unknown",
         
 'countries': {
                 '--':           "unknown",
                 'AD':           "Andorra",
                 'AE':           "United Arab Emirates",
                 'AF':           "Afghanistan",
                 'AG':           "Antigua and Barbuda",
                 'AI':           "Anguilla",
                 'AL':           "Albania",
                 'AM':           "Armenia",
                 'AN':           "Netherlands Antilles",
                 'AO':           "Angola",
                 'AP':           "Non-Spec Asia Pas Location",
                 'AR':           "Argentina",
                 'AS':           "American Samoa",
                 'AT':           "Austria",
                 'AU':           "Australia",
                 'AW':           "Aruba",
                 'AX':           "Aland Islands",
diff --git a/frontend/gamma/js/Clipperz/PM/Strings/Strings_en-US.js b/frontend/gamma/js/Clipperz/PM/Strings/Strings_en-US.js
index b540633..85d55c0 100644
--- a/frontend/gamma/js/Clipperz/PM/Strings/Strings_en-US.js
+++ b/frontend/gamma/js/Clipperz/PM/Strings/Strings_en-US.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //=============================================================================
 //
         //      E N G L I S H   A M E R I C A N  ( en_US )
 //
 //=============================================================================
 
 Clipperz.PM.Strings.Languages['en-us'] = {
 /*
         //Login page - description
 'clipperzServiceDescription': "\
                 <!--    FIX CSS                 DONE    -->\
         <h2>Keep it to yourself!</h2>\
         <ul>\
                 <li>\
                         <h3>Clipperz is:</h3>\
                         <ul>\
                                 <li><p>a secure and simple password manager</p></li>\
                                 <li><p>an effective single sign-on solution</p></li>\
                                 <li><p>a digital vault for your personal data</p></li>\
                         </ul>\
                 </li>\
                 <li>\
                         <h3>With Clipperz you can:</h3>\
                         <ul>\
                                 <li><p>store and manage your passwords and online credentials</p></li>\
                                 <li><p>login to your web services without entering any username or password</p></li>\
                                 <li><p>protect all your sensitive data: codes for burglar alarms, PINs, credit card numbers, …</p></li>\
                                 <li><p>share secrets with family members and associates (coming soon)</p></li>\
                         </ul>\
                 </li>\
                 <li>\
                         <h3>Clipperz benefits:</h3>\
                         <ul>\
                                 <li><p>free and completely anonymous</p></li>\
                                 <li><p>access it any time from any computer</p></li>\
                                 <li><p>no software to download and nothing to install</p></li>\
                                 <li><p>avoid keeping secrets on your PC or on paper</p></li>\
                         </ul>\
                 </li>\
                 <li>\
                         <h3>Clipperz security:</h3>\
                         <ul>\
                                 <li><p>your secrets are locally encrypted by your browser before being uploaded to Clipperz</p></li>\
                                 <li><p>the encryption key is a passphrase known only to you</p></li>\
                                 <li><p>Clipperz hosts your sensitive data in encrypted form and could never actually access the data in its plain form</p></li>\
diff --git a/frontend/gamma/js/Clipperz/PM/Toll.js b/frontend/gamma/js/Clipperz/PM/Toll.js
index bb31c43..e9c3092 100644
--- a/frontend/gamma/js/Clipperz/PM/Toll.js
+++ b/frontend/gamma/js/Clipperz/PM/Toll.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 
 //=============================================================================
 
 Clipperz.PM.Toll = function(args) {
         args = args || {};
 
         this._requestType = args.requestType;
         this._targetValue = args.targetValue;
         this._cost = args.cost;
         this._toll = null;
 
         return this;
 }
 
 Clipperz.PM.Toll.prototype = MochiKit.Base.update(null, {
 
         'toString': function() {
                 return "Clipperz.PM.Toll (" + this.requestType() + ": " + this.cost() + " - " + ((this.toll() == null)? 'UNPAID' : 'PAID') + ")";
         },
 
         //-------------------------------------------------------------------------
 
         'requestType': function() {
                 return this._requestType;
         },
 
         //-------------------------------------------------------------------------
 
         'targetValue': function() {
                 return this._targetValue;
         },
 
         //-------------------------------------------------------------------------
 
         'cost': function() {
                 return this._cost;
         },
         
         //-------------------------------------------------------------------------
 
         'toll': function() {
                 return this._toll;
         },
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/CoverActions/download.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/CoverActions/download.js
index 25e82ca..f667526 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/CoverActions/download.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/CoverActions/download.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //download.js
         //Download
 //
         //Created by Giulio Cesare Solaroli on 3/15/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_CoverActions_downloadWidth = 46.0;
 var kClipperz_PM_UI_Canvas_CoverActions_downloadHeight = 46.0;
 
 function Clipperz_PM_UI_Canvas_CoverActions_download(canvas, aColor, aFillColor, aThickness)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var stroke;
         var path;
         var pointX;
         var pointY;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_CoverActions_downloadWidth + canvas.height / kClipperz_PM_UI_Canvas_CoverActions_downloadHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_CoverActions_downloadWidth, canvas.height / kClipperz_PM_UI_Canvas_CoverActions_downloadHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_CoverActions_downloadWidth, kClipperz_PM_UI_Canvas_CoverActions_downloadHeight);
         
         // arrow
         
         stroke = aThickness;
         stroke *= resolution;
         if (stroke < 1.0)
                 stroke = Math.ceil(stroke);
         else
                 stroke = Math.round(stroke);
         stroke /= resolution;
         alignStroke = (0.5 * stroke * resolution) % 1.0;
         context.beginPath();
         pointX = 16.5;
         pointY = 22.5;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/CoverActions/look.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/CoverActions/look.js
index ba425ec..dae5a2d 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/CoverActions/look.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/CoverActions/look.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //look.js
         //Look
 //
         //Created by Giulio Cesare Solaroli on 3/15/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_CoverActions_lookWidth = 46.0;
 var kClipperz_PM_UI_Canvas_CoverActions_lookHeight = 46.0;
 
 function Clipperz_PM_UI_Canvas_CoverActions_look(canvas, aColor, aFillColor, aThickness)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var stroke;
         var path;
         var pointX;
         var pointY;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_CoverActions_lookWidth + canvas.height / kClipperz_PM_UI_Canvas_CoverActions_lookHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_CoverActions_lookWidth, canvas.height / kClipperz_PM_UI_Canvas_CoverActions_lookHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_CoverActions_lookWidth, kClipperz_PM_UI_Canvas_CoverActions_lookHeight);
         
         // Layer 6
         
         stroke = aThickness;
         stroke *= resolution;
         if (stroke < 1.0)
                 stroke = Math.ceil(stroke);
         else
                 stroke = Math.round(stroke);
         stroke /= resolution;
         alignStroke = (0.5 * stroke * resolution) % 1.0;
         context.save();
         context.translate(17.5, 23.0);
         context.rotate(-0.503);
         context.translate(-17.5, -23.0);
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/directLogin.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/directLogin.js
index 5c1f860..497fd05 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/directLogin.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/directLogin.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //directLogin.js
         //directLogin
 //
         //Created by Giulio Cesare Solaroli on 3/7/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Features_directLoginWidth = 76.0;
 var kClipperz_PM_UI_Canvas_Features_directLoginHeight = 76.0;
 
 function Clipperz_PM_UI_Canvas_Features_directLogin(canvas, aColor, aBannerColor, aBannerBackgroundColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var stroke;
         var path;
         var pointX;
         var pointY;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Features_directLoginWidth + canvas.height / kClipperz_PM_UI_Canvas_Features_directLoginHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Features_directLoginWidth, canvas.height / kClipperz_PM_UI_Canvas_Features_directLoginHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Features_directLoginWidth, kClipperz_PM_UI_Canvas_Features_directLoginHeight);
         
         // Layer 2
         
         stroke = 6.0;
         stroke *= resolution;
         if (stroke < 1.0)
                 stroke = Math.ceil(stroke);
         else
                 stroke = Math.round(stroke);
         stroke /= resolution;
         alignStroke = (0.5 * stroke * resolution) % 1.0;
         context.beginPath();
         pointX = 30.0;
         pointY = 41.0;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/protect.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/protect.js
index b829ed6..f015535 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/protect.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/protect.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //protect.js
         //protect
 //
         //Created by Giulio Cesare Solaroli on 3/7/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Features_protectWidth = 76.0;
 var kClipperz_PM_UI_Canvas_Features_protectHeight = 76.0;
 
 function Clipperz_PM_UI_Canvas_Features_protect(canvas, aColor, aBannerColor, aBannerBackgroundColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         var controlPoint1X;
         var controlPoint1Y;
         var controlPoint2X;
         var controlPoint2Y;
         var stroke;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Features_protectWidth + canvas.height / kClipperz_PM_UI_Canvas_Features_protectHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Features_protectWidth, canvas.height / kClipperz_PM_UI_Canvas_Features_protectHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Features_protectWidth, kClipperz_PM_UI_Canvas_Features_protectHeight);
         
         // Layer 1
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 38.5;
         pointY = 36.0;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
         pointX = 37.068;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/share.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/share.js
index 8d73cc7..47972fc 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/share.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/share.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //share.js
         //share
 //
         //Created by Giulio Cesare Solaroli on 3/7/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Features_shareWidth = 76.0;
 var kClipperz_PM_UI_Canvas_Features_shareHeight = 76.0;
 
 function Clipperz_PM_UI_Canvas_Features_share(canvas, aColor, aBannerColor, aBannerBackgroundColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         var controlPoint1X;
         var controlPoint1Y;
         var controlPoint2X;
         var controlPoint2Y;
         var stroke;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Features_shareWidth + canvas.height / kClipperz_PM_UI_Canvas_Features_shareHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Features_shareWidth, canvas.height / kClipperz_PM_UI_Canvas_Features_shareHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Features_shareWidth, kClipperz_PM_UI_Canvas_Features_shareHeight);
         
         // Layer 1
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 43.179;
         pointY = 18.621;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
         pointX = 37.163;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/store.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/store.js
index 572d9be..a4f30b2 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/store.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Features/store.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //store.js
         //store
 //
         //Created by Giulio Cesare Solaroli on 3/7/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Features_storeWidth = 76.0;
 var kClipperz_PM_UI_Canvas_Features_storeHeight = 76.0;
 
 function Clipperz_PM_UI_Canvas_Features_store(canvas, aColor, aBannerColor, aBannerBackgroundColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Features_storeWidth + canvas.height / kClipperz_PM_UI_Canvas_Features_storeHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Features_storeWidth, canvas.height / kClipperz_PM_UI_Canvas_Features_storeHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Features_storeWidth, kClipperz_PM_UI_Canvas_Features_storeHeight);
         
         // Layer 1
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 27.0;
         pointY = 29.5;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
         pointX = 27.0;
         pointY = 24.5;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.lineTo(pointX, pointY);
         pointX = 22.0;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/GraphicFunctions.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/GraphicFunctions.js
index b9443bd..dccefab 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/GraphicFunctions.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/GraphicFunctions.js
@@ -1,65 +1,63 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Canvas');
 
 MochiKit.Base.update(Clipperz.PM.UI.Canvas , {
         'marks': {
                         '!':Clipperz_PM_UI_Canvas_Marks_exclamationMark,
                         '?':Clipperz_PM_UI_Canvas_Marks_questionMark,
                         'i':Clipperz_PM_UI_Canvas_Marks_info
         },
 
         'features': {
                         'store':        Clipperz_PM_UI_Canvas_Features_store,
                         'protect':      Clipperz_PM_UI_Canvas_Features_protect,
                         'directLogin':Clipperz_PM_UI_Canvas_Features_directLogin,
                         'share':        Clipperz_PM_UI_Canvas_Features_share
         },
         
         'tips': {
                         'open':                 Clipperz_PM_UI_Canvas_Tips_open,
                         'close':        Clipperz_PM_UI_Canvas_Tips_close
         },
 
         'star': {
                         'normal':       Clipperz_PM_UI_Canvas_Star_normal
         },
 
         'coverActions': {
                         'look':                 Clipperz_PM_UI_Canvas_CoverActions_look,
                         'download':     Clipperz_PM_UI_Canvas_CoverActions_download
         },
 
         'registerButton': {
                         'normal':       Clipperz_PM_UI_Canvas_RegisterButton_normal
         },
 
         'logo': {
                         'normal':       Clipperz_PM_UI_Canvas_Logo_normal
         },
         
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Logo/normal.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Logo/normal.js
index cc60bba..24c0bc3 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Logo/normal.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Logo/normal.js
@@ -1,54 +1,52 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //normal.js
         //New Image
 //
         //Created by Giulio Cesare Solaroli on 2/13/12
         //Copyright 2012 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Logo_normalWidth = 150.0;
 var kClipperz_PM_UI_Canvas_Logo_normalHeight = 39.0;
 
 function Clipperz_PM_UI_Canvas_Logo_normal(canvas, logo, fontSize, text_color)
 {
         var context = canvas.getContext("2d");
 
         canvas.width = kClipperz_PM_UI_Canvas_Logo_normalWidth;
         canvas.height = kClipperz_PM_UI_Canvas_Logo_normalHeight;
 
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Logo_normalWidth, canvas.height / kClipperz_PM_UI_Canvas_Logo_normalHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Logo_normalWidth, kClipperz_PM_UI_Canvas_Logo_normalHeight);
         
         context.font = fontSize + " HelveticaNeue-Bold";
         context.fillStyle = text_color;
         context.fillText(logo, 3, 30);
         
         context.restore();
 }
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/exclamationMark.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/exclamationMark.js
index 02f2f80..5982f0d 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/exclamationMark.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/exclamationMark.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //exclamationMark.js
         //!
 //
         //Created by Giulio Cesare Solaroli on 3/7/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Marks_exclamationMarkWidth = 50.0;
 var kClipperz_PM_UI_Canvas_Marks_exclamationMarkHeight = 50.0;
 
 function Clipperz_PM_UI_Canvas_Marks_exclamationMark(canvas, aColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         var controlPoint1X;
         var controlPoint1Y;
         var controlPoint2X;
         var controlPoint2Y;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Marks_exclamationMarkWidth + canvas.height / kClipperz_PM_UI_Canvas_Marks_exclamationMarkHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Marks_exclamationMarkWidth, canvas.height / kClipperz_PM_UI_Canvas_Marks_exclamationMarkHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Marks_exclamationMarkWidth, kClipperz_PM_UI_Canvas_Marks_exclamationMarkHeight);
         
         // Layer 1
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 26.499;
         pointY = 10.848;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
         pointX = 20.887;
         pointY = 11.584;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/info.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/info.js
index fad5c10..2501992 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/info.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/info.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //info.js
         //i
 //
         //Created by Giulio Cesare Solaroli on 3/7/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Marks_infoWidth = 50.0;
 var kClipperz_PM_UI_Canvas_Marks_infoHeight = 50.0;
 
 function Clipperz_PM_UI_Canvas_Marks_info(canvas, aColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         var controlPoint1X;
         var controlPoint1Y;
         var controlPoint2X;
         var controlPoint2Y;
         var color;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Marks_infoWidth + canvas.height / kClipperz_PM_UI_Canvas_Marks_infoHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Marks_infoWidth, canvas.height / kClipperz_PM_UI_Canvas_Marks_infoHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Marks_infoWidth, kClipperz_PM_UI_Canvas_Marks_infoHeight);
         
         // Layer 1
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 30.253;
         pointY = 37.436;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
         pointX = 28.505;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/questionMark.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/questionMark.js
index 5842828..9a8ac7d 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/questionMark.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Marks/questionMark.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //questionMark.js
         //?
 //
         //Created by Giulio Cesare Solaroli on 3/7/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Marks_questionMarkWidth = 50.0;
 var kClipperz_PM_UI_Canvas_Marks_questionMarkHeight = 50.0;
 
 function Clipperz_PM_UI_Canvas_Marks_questionMark(canvas, aColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         var controlPoint1X;
         var controlPoint1Y;
         var controlPoint2X;
         var controlPoint2Y;
         var color;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Marks_questionMarkWidth + canvas.height / kClipperz_PM_UI_Canvas_Marks_questionMarkHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Marks_questionMarkWidth, canvas.height / kClipperz_PM_UI_Canvas_Marks_questionMarkHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Marks_questionMarkWidth, kClipperz_PM_UI_Canvas_Marks_questionMarkHeight);
         
         // Layer 1
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 24.118;
         pointY = 24.464;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
         pointX = 24.854;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/RegisterButton/normal.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/RegisterButton/normal.js
index 2462d0e..65e5ca6 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/RegisterButton/normal.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/RegisterButton/normal.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //normal.js
         //normal
 //
         //Created by Giulio Cesare Solaroli on 3/24/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_RegisterButton_normalWidth = 282.0;
 var kClipperz_PM_UI_Canvas_RegisterButton_normalHeight = 93.0;
 
 function Clipperz_PM_UI_Canvas_RegisterButton_normal(canvas, aBackgroundColor, aDarkBackgroundColor, aLightColor, aDarkColor, aStarColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         var controlPoint1X;
         var controlPoint1Y;
         var controlPoint2X;
         var controlPoint2Y;
         var gradient;
         var color;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_RegisterButton_normalWidth + canvas.height / kClipperz_PM_UI_Canvas_RegisterButton_normalHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_RegisterButton_normalWidth, canvas.height / kClipperz_PM_UI_Canvas_RegisterButton_normalHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_RegisterButton_normalWidth, kClipperz_PM_UI_Canvas_RegisterButton_normalHeight);
         
         // background
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 241.0;
         pointY = 80.0;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Star/normal.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Star/normal.js
index cf475c6..5b344ef 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Star/normal.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Star/normal.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //normal.js
         //normal
 //
         //Created by Giulio Cesare Solaroli on 3/15/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Star_normalWidth = 46.0;
 var kClipperz_PM_UI_Canvas_Star_normalHeight = 46.0;
 
 function Clipperz_PM_UI_Canvas_Star_normal(canvas, aColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Star_normalWidth + canvas.height / kClipperz_PM_UI_Canvas_Star_normalHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Star_normalWidth, canvas.height / kClipperz_PM_UI_Canvas_Star_normalHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Star_normalWidth, kClipperz_PM_UI_Canvas_Star_normalHeight);
         
         // *
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 8.613;
         pointY = 15.583;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
         pointX = 18.563;
         pointY = 18.821;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.lineTo(pointX, pointY);
         pointX = 18.563;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Tips/close.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Tips/close.js
index cd7ed90..21dfcc0 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Tips/close.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Tips/close.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //close.js
         //close
 //
         //Created by Giulio Cesare Solaroli on 3/14/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Tips_closeWidth = 310.0;
 var kClipperz_PM_UI_Canvas_Tips_closeHeight = 6.0;
 
 function Clipperz_PM_UI_Canvas_Tips_close(canvas, aColor, aBackgroundColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Tips_closeWidth + canvas.height / kClipperz_PM_UI_Canvas_Tips_closeHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Tips_closeWidth, canvas.height / kClipperz_PM_UI_Canvas_Tips_closeHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Tips_closeWidth, kClipperz_PM_UI_Canvas_Tips_closeHeight);
         
         // background
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 310.0;
         pointY = 6.0;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
         pointX = 310.0;
         pointY = 0.0;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.lineTo(pointX, pointY);
         pointX = 0.0;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Tips/open.js b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Tips/open.js
index 30c1c69..9c76865 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Canvas/Tips/open.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Canvas/Tips/open.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 //
         //open.js
         //open
 //
         //Created by Giulio Cesare Solaroli on 3/14/10
         //Copyright 2010 Clipperz
         //This code was generated by Opacity. You may use or modify it in any way.
 //
 
 var kClipperz_PM_UI_Canvas_Tips_openWidth = 310.0;
 var kClipperz_PM_UI_Canvas_Tips_openHeight = 6.0;
 
 function Clipperz_PM_UI_Canvas_Tips_open(canvas, aColor, aBackgroundColor)
 {
         var context = canvas.getContext("2d");
         var alignStroke;
         var resolution;
         var path;
         var pointX;
         var pointY;
         var color;
         if (window.devicePixelRatio)
                 resolution = window.devicePixelRatio;
         else
                 resolution = 1.0;
         resolution *= 0.5 * (canvas.width / kClipperz_PM_UI_Canvas_Tips_openWidth + canvas.height / kClipperz_PM_UI_Canvas_Tips_openHeight);
         
         context.save();
         context.scale(canvas.width / kClipperz_PM_UI_Canvas_Tips_openWidth, canvas.height / kClipperz_PM_UI_Canvas_Tips_openHeight);
         context.clearRect(0.0, 0.0, kClipperz_PM_UI_Canvas_Tips_openWidth, kClipperz_PM_UI_Canvas_Tips_openHeight);
         
         // background
         
         alignStroke = 0.0;
         context.beginPath();
         pointX = 310.0;
         pointY = 6.0;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.moveTo(pointX, pointY);
         pointX = 310.0;
         pointY = 0.0;
         pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
         pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
         context.lineTo(pointX, pointY);
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/BaseComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/BaseComponent.js
index b9d7adf..58b7593 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/BaseComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/BaseComponent.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 //#############################################################################
 
 var _Clipperz_PM_Components_base_id_ = 0;
 
 //#############################################################################
 
 Clipperz.PM.UI.Common.Components.BaseComponent = function(args) {
         args = args || {};
         Clipperz.PM.UI.Common.Components.BaseComponent.superclass.constructor.call(this, args);
 
         this._element = args.element || null;
         this._ids = {};
 
         this._slots = {};
         this._slotComponents = {};
 
         this._components = {};
 
         this._cachedSlots = {};
 
         this._isModal = false;
         
         this._isActive = false;
         this._elementUsedToEnterModalState;
 
         this._isFullyRendered = false;
         this._renderingWaitingQueue = [];
 
         //this._slots = {
         //              'header':'header',
         //              'body':         'body',
         //              'footer':'footer'
         //};
 
         return this;
 }
 
 //=============================================================================
 
 //TODO get back to MochiKit.Base.update as we are not extending anything
 //MochiKit.Base.update(Clipperz.PM.UI.Common.Components.BaseComponent.prototype, {
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.BaseComponent, /*Ext.Component*/ Object, {
 
@@ -78,97 +76,96 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.BaseComponent, /*Ext.Compo
 
         'componentId': function () {
                 return this.getId('_id_');
         },
 
         //-------------------------------------------------------------------------
 /*
         'slots': function() {
                 return this._slots;
         },
 */
         'slotComponents': function() {
                 return this._slotComponents;
         },
 
         //-------------------------------------------------------------------------
 
         'components': function () {
                 return this._components;
         },
 
         'addComponent': function (aComponent) {
                 this.components()[aComponent.componentId()] = aComponent;
         },
         
         'removeComponent': function (aComponent) {
                 var componentId;
                 
                 componentId = aComponent.componentId();
                 this.components()[componentId].remove();
                 delete this.components()[componentId];
         },
 
         //-------------------------------------------------------------------------
 /*
         'domHelper': function() {
                 return Clipperz.YUI.DomHelper;
         },
         */
         //-------------------------------------------------------------------------
 /*
         'domHelperAppend': function(aValue) {
                 Clipperz.YUI.DomHelper.append(this.element().dom, aValue);
         },
         */
         //-------------------------------------------------------------------------
 
         'element': function() {
-//MochiKit.Logging.logDebug(">>> BaseComponent.element");
                 return MochiKit.DOM.getElement(this._element);
         },
         
         'setElement': function(aNode) {
                 this._element = aNode;
         },
 
         //-----------------------------------------------------
 
         'displayElement': function() {
                 return this.element();
         },
 
         //-------------------------------------------------------------------------
 
         'renderInNode': function(aDomNode) {
                 this.setElement(aDomNode);
                 this.render();
         },
 
         'render': function() {
                 this.clear();
                 this.renderSelf();
                 this.renderComponents();
                 if (this.shouldShowTranslationHints()) {
                         this.renderTranslationHints();
                 }
                 if (this.shouldShowElementWhileRendering()) {
                         MochiKit.Style.showElement(this.displayElement());
                 };
 
                 this._isFullyRendered = true;
         
                 MochiKit.Iter.forEach(this.renderingWaitingQueue(), MochiKit.Base.methodcaller('callback'));
                 this.resetRenderingWaitingQueue();
         },
 
         'renderSelf': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         'renderComponents': function() {
                         varslotName;
                 
                 for (slotName in this.slotComponents()) {
                         this.slotComponents()[slotName].renderInNode(this.elementForSlotNamed(slotName));
                 }
         },
@@ -268,101 +265,98 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.BaseComponent, /*Ext.Compo
         
         'slotNamed': function(aSlotName) {
                 var result;
 
                 this.checkSlotNamed(aSlotName);
                 if (typeof(this.cachedSlots()[aSlotName]) == 'undefined') {
                         this.cachedSlots()[aSlotName] = new Clipperz.PM.UI.Common.Components.ComponentSlot(this,aSlotName);
                 }
                 
                 result = this.cachedSlots()[aSlotName];
                 
                 return result;
         },
 
         //-----------------------------------------------------
 
         'elementForSlotNamed': function(aSlotName) {
                 return MochiKit.DOM.getElement(this._slots[aSlotName]);
         },
 
         //-----------------------------------------------------
 
         'componentForSlotNamed': function(aSlotName) {
                 return this.slotComponents()[aSlotName];
         },
 
         'setComponentForSlotNamed': function(aComponent, aSlotName) {
                 var domNode;
 
                 this.checkSlotNamed(aSlotName);
 
                 if (this.slotComponents()[aSlotName] != null) {
                         this.slotComponents()[aSlotName].remove();
                 }
 
                 this.slotComponents()[aSlotName] = aComponent;
 
         //      domNode = MochiKit.DOM.getElement(this.slotNamed(aSlotName));
                 domNode = this.elementForSlotNamed(aSlotName);
 
                 if (domNode != null) {
                         aComponent.renderInNode(domNode);
                 }
         },
 
         //-----------------------------------------------------
 /*
         'purgeListeners': function() {
-//MochiKit.Logging.logDebug(">>> Clipperz.PM.UI.Common.Components.BaseComponent.purgeListeners [" + this + "]");
-//MochiKit.Logging.logDebug("--- " + this + ".purgeListeners");
                 Clipperz.NotificationCenter.unregister(this);
                 MochiKit.Signal.disconnectAllTo(this);
-//MochiKit.Logging.logDebug("<<< Clipperz.PM.UI.Common.Components.BaseComponent.purgeListeners");
         },
         */
         //-----------------------------------------------------
 
         'clear': function() {
                         varslotName;
                 var componentId;
 
                 MochiKit.Signal.disconnectAllTo(this);
 
                 for (slotName in this.slotComponents()) {
                         this.slotComponents()[slotName].clear();
                 }
 
                 for (componentId in this.components()) {
                         this.components()[componentId].clear();
                 }
 
         //      if (this.element() != null) {
         //              this.element().innerHTML = "";
         //      }
 
                 if (this.displayElement() != null) {
                         if (this.element() != this.displayElement()) {
                                 MochiKit.DOM.removeElement(this.displayElement());
                         } else {
                                 this.displayElement().innerHTML = "";
                         }
                 }
                 
                 if (this.isModal()) {
                                 //TODO: cleanup when the closed element was shown modally.
                 }
         },
 
 
         'remove': function() {
                         varslotName;
                 var componentId;
 
                 for (slotName in this.slotComponents()) {
                         this.slotComponents()[slotName].remove();
                         delete this.slotComponents()[slotName];
                 }
 
                 for (componentId in this.components()) {
                         this.components()[componentId].remove();
                         delete this.components()[componentId];
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Button.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Button.js
index 1010c9d..1268118 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Button.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Button.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 Clipperz.PM.UI.Common.Components.Button = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Common.Components.Button.superclass.constructor.apply(this, arguments);
 
                 this._element   = args.element  || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._text              = args.text             || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._isDefault         = args.isDefault|| false;
 
         this.render();
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Button, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Common.Components.Button component";
         },
 
         //-------------------------------------------------------------------------
 
         'text': function () {
                 return this._text;
         },
 
         'isDefault': function () {
                 return this._isDefault;
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function () {
 /*
                 this.append(this.element(), {tag:'div', id:this.getId('button'), cls:'button_wrapper', children:[
                         {tag:'div', id:this.getId('bodyWrapper'), cls:'button_bodyWrapper', children:[
                                 {tag:'div', id:this.getId('body'), cls:'button_body', children:[
                                         {tag:'span', html:this.text()}
                                 ]},
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/ComponentSlot.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/ComponentSlot.js
index 7f56c1e..2f82359 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/ComponentSlot.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/ComponentSlot.js
@@ -1,61 +1,59 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 //#############################################################################
 
 
 Clipperz.PM.UI.Common.Components.ComponentSlot = function(aComponent, aSlotName) {
         this._component = aComponent;
         this._slotName = aSlotName;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.ComponentSlot, Object, {
 
         //-------------------------------------------------------------------------
 
         'slotName': function() {
                 return this._slotName;
         },
 
         'component': function() {
                 return this._component;
         },
 
         //-------------------------------------------------------------------------
 
         'setContent': function(aComponent) {
                 this.component().setComponentForSlotNamed(aComponent, this.slotName());
         },
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
         
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/FaviconComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/FaviconComponent.js
index 2db2489..bf00ffc 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/FaviconComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/FaviconComponent.js
@@ -1,88 +1,86 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 Clipperz.PM.UI.Common.Components.FaviconComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Common.Components.FaviconComponent.superclass.constructor.apply(this, arguments);
 
         this.render();
         this.setSrc(args.src);
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.FaviconComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Common.Components.FaviconComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'src': function () {
                 return this.element().src;
         },
         
         'setSrc': function (aValue) {
                 this.element().src = (aValue || Clipperz.PM.Strings.getValue('defaultFaviconUrl'));
         },
 
         //-------------------------------------------------------------------------
 
         'clear': function () {},
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function () {
                         MochiKit.Signal.connect(this.element(), 'onerror',this, 'setDefaultFavicon');
                         MochiKit.Signal.connect(this.element(), 'onabort',this, 'setDefaultFavicon');
                         MochiKit.Signal.connect(this.element(), 'onload',this, 'handleOnLoad');
         },
 
         //-------------------------------------------------------------------------
 
         'setDefaultFavicon': function (anEvent) {
                 MochiKit.Signal.disconnectAll(anEvent.src());
                 this.setSrc(null);
         },
 
         'handleOnLoad': function (anEvent) {
                 MochiKit.Signal.disconnectAll(anEvent.src());
-//console.log("HANDLE ON LOAD", anEvent, anEvent.src().src);
+
                 if (anEvent.src().complete == false) {
                         this.setSrc(null);
                 }
         },
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/MessagePanelWithProgressBar.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/MessagePanelWithProgressBar.js
index 2788b79..020290b 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/MessagePanelWithProgressBar.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/MessagePanelWithProgressBar.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 Clipperz.PM.UI.Common.Components.MessagePanelWithProgressBar = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Common.Components.MessagePanelWithProgressBar.superclass.constructor.apply(this, arguments);
 
         //      this._openFromElement                   = args.openFromElement          || null;
                 this._onOkCloseToElement                = args.onOkCloseToElement       || null;
                 this._onCancelCloseToElement    = args.onCancelCloseToElement|| null;
 
                 this._canCancelWhileProcessing= ((typeof(args.canCancelWhileProcessing) == 'undefined') ? true : args.canCancelWhileProcessing);
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.MessagePanelWithProgressBar, Clipperz.PM.UI.Common.Components.SimpleMessagePanel, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Common.Components.MessagePanelWithProgressBar component";
         },
 
         //-------------------------------------------------------------------------
 /*
         'openFromElement': function () {
                 return this._openFromElement;
         },
 */
         //-------------------------------------------------------------------------
 
         'onOkCloseToElement': function () {
                 return this._onOkCloseToElement;
         },
 
         'setOnOkCloseToElement': function (anElement) {
                 this._onOkCloseToElement = anElement;
         },
 
         //-------------------------------------------------------------------------
 
         'onCancelCloseToElement': function () {
@@ -86,76 +84,72 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.MessagePanelWithProgressBa
         'deferredShowModal': function (someArgs, aResult) {
                 if (someArgs['onOkCloseToElement'] != null) {
                         this.setOnOkCloseToElement(someArgs['onOkCloseToElement']);
                 }
 
                 if (someArgs['onCancelCloseToElement'] != null) {
                         this.setOnCancelCloseToElement(someArgs['onCancelCloseToElement']);
                 }
 
                 Clipperz.PM.UI.Common.Components.MessagePanelWithProgressBar.superclass.deferredShowModal.apply(this, arguments);
                 return this.deferred();
         },
 
         //-------------------------------------------------------------------------
 
         'showProgressBar': function () {
                         varprogressBarElement;
                 
                 this.getElement('container').innerHTML = '';
 
                 progressBarElement = this.append(this.getElement('container'), {tag:'div', cls:'progressBarWrapper'});
                 this.addComponent(new Clipperz.PM.UI.Common.Components.ProgressBar({'element':progressBarElement}));
 
                 if (this.canCancelWhileProcessing() == true) {
                         this.setButtons([{text:"Cancel", result:'CANCEL'}]);
                 } else {
                         this.setButtons([]);
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'showFailure': function (someParameters) {
         //      this.setType('ALERT');
                 this.setType(someParameters['type']);
         //      this.setTitle("Login failed");
                 this.setTitle(someParameters['title']);
         //      this.setText("Wrong passphrase; the unlock has failed.");
                 this.setText(someParameters['text']);
         //      this.getElement('container').innerHTML = '';
                 this.getElement('container').innerHTML = '';
         //      this.setButtons([{text:"Close", result:'CANCEL', isDefault:true}]);
                 this.setButtons(someParameters['buttons']);
         },
 
         //-------------------------------------------------------------------------
 
         'closeOk': function () {
-//console.log("=== closeOk");
                 this.showProgressBar();
                 MochiKit.Async.callLater(0.5, MochiKit.Base.method(this.deferred(), 'callback'));
                 this._deferred = null;
         },
         
         'closeCancel': function () {
-//console.log("=== closeCancel");
                 this.deferredHideModal({closeToElement:this.onCancelCloseToElement()});
                 this.deferred().cancel();
                 this._deferred = null;
         },
 
         //-------------------------------------------------------------------------
 
         'deferredDone': function () {
-//console.log("=== deferredDone");
                 return this.deferredHideModal({closeToElement:this.onOkCloseToElement()});
         },
         
         'deferredError': function (someParameters) {
-//console.log("=== deferredError");
                 this.showFailure(someParameters);
         },
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/PasswordEntropyDisplay.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/PasswordEntropyDisplay.js
index 089e3d4..78e8c9b 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/PasswordEntropyDisplay.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/PasswordEntropyDisplay.js
@@ -1,137 +1,122 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 Clipperz.PM.UI.Common.Components.PasswordEntropyDisplay = function(anElement, args) {
         args = args || {};
 
-//MochiKit.Logging.logDebug(">>> new TextFormField");
         Clipperz.PM.UI.Common.Components.PasswordEntropyDisplay.superclass.constructor.call(this, anElement, args);
 
         this._wrapperElement = null;
         this._entropyElement = null;
 
         this.render();
-//MochiKit.Logging.logDebug("<<< new TextFormField");
         
         return this;
 };
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.PasswordEntropyDisplay, Clipperz.PM.UI.Common.Components.BaseComponent, {
         
         'toString': function() {
                 return "Clipperz.PM.UI.Common.Components.PasswordEntropyDisplay";
         },
 
         //-----------------------------------------------------
 
         'wrapperElement': function() {
                 return this._wrapperElement;
         },
         
         'setWrapperElement': function(aValue) {
                 this._wrapperElement = aValue;
         },
         
         //-----------------------------------------------------
 
         'passwordElement': function() {
                 return this.element();
         },
         
         //-----------------------------------------------------
 
         'entropyElement': function() {
                 return this._entropyElement;
         },
         
         'setEntropyElement': function(aValue) {
                 this._entropyElement = aValue;
         },
 
         //-----------------------------------------------------
 
         'render': function() {
 /*
                 MochiKit.Signal.disconnectAllTo(this);
 
                 this.setWrapperElement(this.element().wrap({tag:'div'}));
                 this.setEntropyElement(Clipperz.DOM.Helper.append(this.wrapperElement().dom, {tag:'div', cls:'passwordEntropy', html:"&nbsp;"}, true));
         //      this.setEntropyElement(Clipperz.DOM.Helper.insertBefore(this.element(), {tag:'div', cls:'passwordEntropy', html:"&nbsp;"}, true));
                 this.entropyElement().wrap({tag:'div', cls:'passwordEntropyWrapper'});
 
                 this.updateEntropyElement();
                 
                 this.connect('onkeyup', 'updateEntropyElement');
                 this.connect('onchange', 'updateEntropyElement');
                 this.connect('onblur', 'updateEntropyElement');
 */
                 MochiKit.Signal.disconnectAllTo(this);
 
                 this.setEntropyElement(this.element());
                 this.entropyElement().addClass("entropyLevelIndicator");
 
                 this.updateEntropyElement();
 
                 this.connect('onkeyup', 'updateEntropyElement');
                 this.connect('onchange', 'updateEntropyElement');
                 this.connect('onblur', 'updateEntropyElement');
         },
 
         //-----------------------------------------------------
 
         'computeEntropyForString': function(aValue) {
                 return Clipperz.PM.Crypto.passwordEntropy(aValue);
         },
 
         //-----------------------------------------------------
 
         'updateEntropyElement': function(anEvent) {
-/*
-//MochiKit.Logging.logDebug(">>> PasswordEntropyDisplay.updateEntropyElement");
-                        varmaxExtent;
-                        varentropy;
-                
-                entropy = Math.min(128, this.computeEntropyForString(this.passwordElement().dom.value));
-//MochiKit.Logging.logDebug("--- PasswordEntropyDisplay.updateEntropyElement - entropy: " + entropy);
-                this.entropyElement().setStyle('background-position', "0px " + -entropy + "px");
-                this.entropyElement().setWidth(this.passwordElement().getWidth() * (entropy/128));
-//MochiKit.Logging.logDebug("<<< PasswordEntropyDisplay.updateEntropyElement");
-*/
                         varentropy;
                 
                 entropy = Math.min(128, this.computeEntropyForString(this.passwordElement().dom.value));
 
                 if (entropy == 0) {
                         this.entropyElement().setStyle('background-position', "0px 26px");
                 } else {
                         this.entropyElement().setStyle('background-position', "0px -" + (128-entropy)*26 + "px");
                 }
         },
         
         //-----------------------------------------------------
         __syntaxFix__: '__syntaxFix__'
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/ProgressBar.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/ProgressBar.js
index 5991530..6638008 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/ProgressBar.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/ProgressBar.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 Clipperz.PM.UI.Common.Components.ProgressBar = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Common.Components.ProgressBar.superclass.constructor.apply(this, arguments);
 
                 this._element   = args.element|| Clipperz.Base.exception.raise('MandatoryParameter');
 
         this.renderSelf();
 
         MochiKit.Signal.connect(Clipperz.PM.UI.Common.Controllers.ProgressBarController.defaultController, 'updateProgress', this, 'updateProgressHandler')
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.ProgressBar, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Common.Components.ProgressBar component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
                 this.append(this.element(), {tag:'div', cls:'loadingBar', children:[
                         {tag:'div', cls:'loadingBarProgressBox', children:[
                                 {tag:'div', id:this.getId('loadingBarProgress'), cls:'loadingBarProgress'}
                         ]}
                 ]});
         },
 
         //-------------------------------------------------------------------------
 
         'updateProgressHandler': function (anEvent) {
                 MochiKit.Style.setElementDimensions(this.getId('loadingBarProgress'), {w:anEvent}, '%');
         },
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js
index 1d816a9..8c98811 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Common.Components.SimpleMessagePanel = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Common.Components.SimpleMessagePanel.superclass.constructor.apply(this, arguments);
 
                 this._title             = args.title    || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._text              = args.text             || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._type              = args.type                     || Clipperz.Base.exception.raise('MandatoryParameter');         //ALERT, INFO, ERROR
                 this._buttons   = args.buttons  || Clipperz.Base.exception.raise('MandatoryParameter');
 
         this._buttonComponents = [];
         this._deferred = null;
 
         this.renderModalMask();
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.SimpleMessagePanel, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Common.Components.SimpleMessagePanel component";
         },
 
         //-------------------------------------------------------------------------
 
         'deferred': function() {
                 if (this._deferred == null) {
                         this._deferred = new Clipperz.Async.Deferred("SimpleMessagePanel.deferred", {trace:false});
                 }
 
                 return this._deferred;
         },
 
         //-------------------------------------------------------------------------
 
         'title': function () {
                 return this._title;
         },
@@ -173,125 +171,117 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.SimpleMessagePanel, Clippe
 
                 MochiKit.Base.map(MochiKit.Base.bind(function (aButton) {
                         var buttonElement;
                         var buttonComponent;
                         
         //              element = this.append(this.getElement('buttonArea'), {tag:'div', cls:'button' + (aButton['isDefault'] === true ? ' default' : ''), children:[
         //                      {tag:'a', href:'#'/*, id:this.getId('buttonLink')*/, html:aButton['text']}
         //              ]});
 
                         buttonElement = this.append(this.getElement('buttonArea'), {tag:'div'});
                         buttonComponent = new Clipperz.PM.UI.Common.Components.Button({'element':buttonElement, 'text':aButton['text'], 'isDefault':aButton['isDefault']});
                         this.buttonComponents().push(buttonComponent);
 
                         MochiKit.Signal.connect(buttonComponent, 'onclick', MochiKit.Base.method(this, 'buttonEventHandler', aButton));
                 }, this), MochiKit.Iter.reversed(this.buttons()));
         },
 
         //-------------------------------------------------------------------------
 
         'displayElement': function() {
                 return this.getElement('panel');
         },
 
         //-------------------------------------------------------------------------
 
         'closeOk': function () {
                 this.deferred().callback();
                 this._deferred = null;
         },
         
         'closeCancel': function () {
                 this.deferred().cancel();
                 this._deferred = null;
         },
 
         'closeError': function () {
                 this.deferred().errback();
                 this._deferred = null;
         },
 
         //-------------------------------------------------------------------------
 
         'buttonEventHandler': function(aButton, anEvent) {
                 anEvent.preventDefault();
                 
         //      MochiKit.Signal.signal(this, 'cancelEvent');
                 switch (aButton['result']) {
                         case 'OK':
-//console.log("==> OK");
                                 this.closeOk();
                                 break;
                         case 'CANCEL':
-//console.log("==> CANCEL");
                                 this.closeCancel();
                                 break;
                         default:
-//console.log("==> ????");
                                 this.closeError();
                                 break;
                 }
-//console.log("<==");
         },
 
         //-------------------------------------------------------------------------
 
         'deferredShow': function (someArgs, aResult) {
                 this.deferredShowModal(someArgs);
 
                 this.deferred().addMethod(this, 'deferredHideModal', {closeToElement:someArgs.onOkCloseToElement });
                 this.deferred().addErrback (MochiKit.Base.method(this, 'deferredHideModal', {closeToElement:someArgs.onCancelCloseToElement }));
                 this.deferred().addCallback(MochiKit.Async.succeed, aResult);
 
                 return this.deferred();
         },
 
         //-------------------------------------------------------------------------
 
         'modalDialogMask': function () {
                 return this.getId('modalDialogMask');
         },
         
         'modalDialog': function () {
                 return this.getId('modalDialog');
         },
         
         'modalDialogFrame': function() {
                 return this.getId('modalDialogFrame');
         },
 
         //-------------------------------------------------------------------------
         
         'renderModalMask': function () {
                 Clipperz.DOM.Helper.append(MochiKit.DOM.currentDocument().body,
                         {tag:'div', id:this.getId('modalDialogWrapper'), cls:'modalDialogWrapper simpleMessagePanelMask', children:[
                                 {tag:'div', id:this.getId('modalDialogMask'), cls:'modalDialogMask simpleMessagePanelMask'},
                                 {tag:'div', id:this.getId('modalDialogFrame'), cls:'modalDialogFrame simpleMessagePanelMask'},
                                 {tag:'div', id:this.getId('modalDialog'), cls:'modalDialog simpleMessagePanelMask'}
                         ]}
                 );
         
                 MochiKit.Style.hideElement(this.getId('modalDialogMask'));
                 MochiKit.Style.hideElement(this.getId('modalDialogFrame'));
         },
 
         //-------------------------------------------------------------------------
 
         'keyDownHandler': function (anEvent) {
                 if (anEvent.key().string == 'KEY_ENTER') {
                         anEvent.preventDefault();
-//console.log("13 - RETURN ?", this);
                         this.closeOk();
-//console.log('<<< 13')
                 }
 
                 if (anEvent.key().string == 'KEY_ESCAPE') {
                         anEvent.preventDefault();
-//console.log("27 - ESC ?", this);
                         this.closeCancel();
-//console.log("<<< 27");
                 }
         },
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/TabPanelComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/TabPanelComponent.js
index 936514a..1e2a690 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/TabPanelComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/TabPanelComponent.js
@@ -1,66 +1,64 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 Clipperz.PM.UI.Common.Components.TabPanelComponent = function(args) {
         args = args || {};
         Clipperz.PM.UI.Common.Components.TabPanelComponent.superclass.constructor.call(this, args);
 
         this._tabPanelController = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.TabPanelComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Common.Components.TabPanelComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'tabPanelControllerConfiguration': function() {
                 return this._tabPanelControllerConfiguration;
         },
 
         'tabPanelController': function() {
                 if (this._tabPanelController == null) {
                         this._tabPanelController = new Clipperz.PM.UI.Common.Controllers.TabPanelController({component:this, configuration:this.tabPanelControllerConfiguration()});
                 }
                 
                 return this._tabPanelController;
         },
 
         'initiallySelectedTab': function() {
                 return this._initiallySelectedTab;
         },
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
         
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js
index 8df7e0e..6517d2a 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/Tooltip.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 Clipperz.PM.UI.Common.Components.Tooltip = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Common.Components.Tooltip.superclass.constructor.apply(this, arguments);
 
                 this._element   = args.element|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._text              = args.text     || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._position  = args.position         || 'BELOW';             //'BELOW', 'ABOVE', 'LEFT', 'RIGHT'
 
         this._boxDimensions = null;
         this._enabled = (typeof(args.enabled) == 'undefined' ? true : args.enabled);
         this._isVisible = false;
 
         this.renderSelf();
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Common.Components.Tooltip component";
         },
 
         //-------------------------------------------------------------------------
 
         'text': function () {
                 return this._text;
         },
         
         'setText': function (aValue) {
                 this._text = aValue;
         },
 
         //-------------------------------------------------------------------------
 
         'position': function () {
                 return this._position;
         },
@@ -96,119 +94,112 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
         //      this.append(this.element(), {tag:'div', id:this.getId('tooltip'), cls:'tooltip ' + this.position(), children:[
         //      this.append(MochiKit.DOM.currentDocument().body, {tag:'div', id:this.getId('tooltip'), cls:'tooltip ' + this.position(), children:[
                 this.append(MochiKit.DOM.getElement('Clipperz_PM_UI_Common_Components_Tooltip_wrapperNode'), {tag:'div', id:this.getId('tooltip'), cls:'tooltip ' + this.position(), children:[
                         {tag:'div', id:this.getId('body'), cls:'tooltip_body', children:[
                                 {tag:'div', cls:'tooltip_text', children:[
                                         {tag:'span', html:this.text()}
                                 ]}//,
         //                      {tag:'div', id:this.getId('footer'), cls:'tooltip_footer'}
                         ]},
                         {tag:'div', id:this.getId('arrow'), cls:'tooltip_arrow'}
                 ]});
 
                 this._boxDimensions = MochiKit.Style.getElementDimensions(this.getId('body'));
         //      this._boxDimensions.h += MochiKit.Style.getElementDimensions(this.getId('footer')).h;
 
                 MochiKit.Style.hideElement(this.displayElement());
                 MochiKit.Signal.connect(this.element(), 'onmouseenter', this, 'show');
                 MochiKit.Signal.connect(this.element(), 'onmouseleave', this, 'hide');
         },
 
         //-----------------------------------------------------
 
         'displayElement': function() {
                 return this.getElement('tooltip');
         },
 
         //-------------------------------------------------------------------------
 
         'boxDimensions': function () {
                 return this._boxDimensions;
         },
 
         //-------------------------------------------------------------------------
 
         'show': function () {
                 var elementSizeAndPosition;
                 var arrowPosition;
                 var bodyPosition;
 
                 if (this.isVisible() == false) {
                         arrowPosition = {};
                         bodyPosition = {};
 
                         this.setIsVisible(true);
                         elementSizeAndPosition = Clipperz.Style.getSizeAndPosition(this.element());
-//console.log("ELEMENT SIZE AND POSITION", Clipperz.Base.serializeJSON(elementSizeAndPosition));
-//console.log("BOX DIMENSIONS", Clipperz.Base.serializeJSON(this.boxDimensions()));
                         switch (this.position()) {
                                 case 'ABOVE':
-//console.log("ABOVE");
         //                              MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px');
                                         bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2);
                                         bodyPosition.y = elementSizeAndPosition.position.y - this.boxDimensions().h - 13;
                                 
         //                              arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2);
         //                              arrowPosition.y = elementSizeAndPosition.position.y - 13;
                                         break;
                                 case 'BELOW':
-//console.log("BELOW");
         //                              MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:36, h:13}, 'px');
                                         bodyPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - this.boxDimensions().w/2);
                                         bodyPosition.y = elementSizeAndPosition.position.y + elementSizeAndPosition.dimensions.h + 13;
                                 
         //                              arrowPosition.x = elementSizeAndPosition.position.x + (elementSizeAndPosition.dimensions.w/2 - 36/2);
         //                              arrowPosition.y = elementSizeAndPosition.position.y + elementSizeAndPosition.dimensions.h;
                                         break;
                                 case 'LEFT':
-//console.log("LEFT");
         //                              MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px');
                                         bodyPosition.x = elementSizeAndPosition.position.x - this.boxDimensions().w - 13;
                                         bodyPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - this.boxDimensions().h/2);
 
         //                              arrowPosition.x = elementSizeAndPosition.position.x -13;
         //                              arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2);
                                         break;
                                 case 'RIGHT':
-//console.log("RIGHT");
         //                              MochiKit.Style.setElementDimensions(this.getId('arrow'), {w:13, h:36}, 'px');
                                         bodyPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w + 13;
                                         bodyPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - this.boxDimensions().h/2);
 
         //                              arrowPosition.x = elementSizeAndPosition.position.x + elementSizeAndPosition.dimensions.w;
         //                              arrowPosition.y = elementSizeAndPosition.position.y + (elementSizeAndPosition.dimensions.h/2 - 36/2);
                                         break;
                         }
-//console.log("X: " + bodyPosition.x + ", Y: " + bodyPosition.y);
 
                         MochiKit.Style.setElementPosition(this.getId('tooltip'), bodyPosition);
         //              MochiKit.Style.setElementPosition(this.getId('body'), bodyPosition);
         //              MochiKit.Style.setElementPosition(this.getId('arrow'), arrowPosition);
                         MochiKit.Visual.appear(this.displayElement(), {duration:0.4});
                 }
         },
 
         'hide': function () {
                 if (this.isVisible() == true) {
                         MochiKit.Visual.fade(this.displayElement(), {duration:0.4});
                         this.setIsVisible(false);
                 }
         },
 
         //-------------------------------------------------------------------------
 /*
         'shouldRemoveElementWhenClearningUp': function () {
                 return false;
         },
 */
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
 
 Clipperz.PM.UI.Common.Components.Tooltip.initTooltips = function () {
         Clipperz.DOM.Helper.insertBefore(MochiKit.DOM.currentDocument().body.childNodes[0], {tag:'div', id:'Clipperz_PM_UI_Common_Components_Tooltip_wrapperNode'});
 }
 
 MochiKit.DOM.addLoadEvent(Clipperz.PM.UI.Common.Components.Tooltip.initTooltips);
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/TranslatorWidget.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/TranslatorWidget.js
index c41fc7c..ba58edd 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Components/TranslatorWidget.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Components/TranslatorWidget.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 Clipperz.PM.UI.Common.Components.TranslatorWidget = function(args) {
 Clipperz.log(">>> TranslatorWidget.new");
         args = args || {};
 
         Clipperz.PM.UI.Common.Components.TranslatorWidget.superclass.constructor.apply(this, arguments);
 
         //      this._element   = args.element|| Clipperz.Base.exception.raise('MandatoryParameter');
         //      this._stringID  = args.stringID         || MochiKit.DOM.getNodeAttribute(this.element(), 'stringID')|| Clipperz.Base.exception.raise('MandatoryParameter');
 
         //MochiKit.Signal.connect(this.element(), 'onmouseenter', this, 'show');
         //MochiKit.Signal.connect(this.element(), 'onmouseleave', this, 'hide');
 
 Clipperz.log("<<< TranslatorWidget.new");
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.TranslatorWidget, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Common.Components.TranslatorWidget component";
         },
 
         //-------------------------------------------------------------------------
 /*
         'renderSelf': function() {
                 this.append(this.element(), {tag:'div', id:this.getId('tooltip'), cls:'tooltip ' + this.position(), children:[
                         {tag:'div', id:this.getId('body'), cls:'tooltip_body', children:[
                                 {tag:'div', cls:'tooltip_text', children:[
                                         {tag:'span', html:this.text()}
                                 ]},
                                 {tag:'div', id:this.getId('footer'), cls:'tooltip_footer'}
                         ]},
                         {tag:'div', id:this.getId('arrow'), cls:'tooltip_arrow'}
                 ]});
 
                 this._boxDimensions = MochiKit.Style.getElementDimensions(this.getId('body'));
         //      this._boxDimensions.h += MochiKit.Style.getElementDimensions(this.getId('footer')).h;
 
                 MochiKit.Style.hideElement(this.displayElement());
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/DirectLoginRunner.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/DirectLoginRunner.js
index 5fd10f9..77d59a5 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/DirectLoginRunner.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/DirectLoginRunner.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Controllers');
 
 Clipperz.PM.UI.Common.Controllers.DirectLoginRunner = function(args) {
                 this._directLogin       = args['directLogin']   || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._target    = Clipperz.PM.Crypto.randomKey();
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Common.Controllers.DirectLoginRunner.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Common.Controllers.DirectLoginRunner";
         },
 
         //-----------------------------------------------------------------------------
 
         'directLogin': function () {
                 return this._directLogin;
         },
 
         //-----------------------------------------------------------------------------
 
         'target': function () {
                 return this._target;
         },
 
         //=============================================================================
 
         'setWindowTitle': function (aWindow, aTitle) {
                 aWindow.document.title = aTitle;
         },
         
         'setWindowBody': function (aWindow, anHTML) {
                 aWindow.document.body.innerHTML = anHTML;
         },
 
         //=============================================================================
 
         'initialWindowSetup': function (aWindow) {
                 this.setWindowTitle(aWindow, "Loading Clipperz Direct Login");
                 this.setWindowBody (aWindow, MochiKit.DOM.toHTML(MochiKit.DOM.H3("Loading Clipperz Direct Login ...")));
         },
 
         //-----------------------------------------------------------------------------
@@ -109,156 +107,150 @@ MochiKit.Base.update(Clipperz.PM.UI.Common.Controllers.DirectLoginRunner.prototy
                                         varformSubmitFunction;
 
                                 formSubmitFunction = MochiKit.Base.method(formElement, 'submit');
                                 if (Clipperz_IEisBroken == true) {
                                         formElement.submit();
                                 } else {
                                         formSubmitFunction();
                                 }
 */
                         } else {
                                 submitButtons[0].click();
                         }
                 }, this));
         },
 
         //-------------------------------------------------------------------------
 
         'runSubmitFormDirectLogin': function (aWindow, someAttributes) {
                 var html;
                 var formElement;
                 var submitFunction;
 
                 formElement = MochiKit.DOM.FORM({
                         'id':'directLoginForm',
                         'method':someAttributes['formAttributes']['method'],
                         'action':someAttributes['formAttributes']['action']
                 });
 
                 submitFunction = formElement.submit;
                 
                 MochiKit.DOM.appendChildNodes(formElement, MochiKit.Base.map(function (anInputAttributes) {
                         return MochiKit.DOM.INPUT({'type':'hidden', 'name':anInputAttributes[0], 'value':anInputAttributes[1]});
                 }, MochiKit.Base.items(someAttributes['inputValues'])));
 
                         html ='';
                 html += '<h3>Loading ' + someAttributes['label'] + ' ...</h3>';
                         html +=MochiKit.DOM.appendChildNodes(MochiKit.DOM.DIV(), MochiKit.DOM.appendChildNodes(MochiKit.DOM.DIV({style:'display:none; visibility:hidden;'}), formElement)).innerHTML; 
 
                 this.updateWindowWithHTMLContent(aWindow, html);
                 this.submitLoginForm(aWindow, submitFunction);
         },
         
         //-------------------------------------------------------------------------
 
         'runHttpAuthDirectLogin': function(aWindow, someAttributes) {
                 var completeUrl;
                 var url;
 
-//console.log("runHttpAuthDirectLogin", someAttributes);
                 url = someAttributes['inputValues']['url'];
 
                 if (/^https?\:\/\//.test(url) == false) {
                         url = 'http://' + url;
                 }
                 
                 if (Clipperz_IEisBroken === true) {
                         completeUrl = url;
                 } else {
                         var username;
                         var password;
                         
                         username = someAttributes['inputValues']['username'];
                         password = someAttributes['inputValues']['password'];
                         /(^https?\:\/\/)?(.*)/.test(url);
 
                         completeUrl = RegExp.$1 + username + ':' + password + '@' + RegExp.$2;
                 }
                 
                 window.open(completeUrl, this.target());
         },
 
         //=============================================================================
 
         'runDirectLogin': function (aWindow) {
                 var deferredResult;
 
-//console.log(">>> runDirectLogin");
                 deferredResult = new Clipperz.Async.Deferred("DirectLoginRunner.openDirectLogin", {trace:false});
                 deferredResult.addMethod(this, 'initialWindowSetup', aWindow);
                 deferredResult.addMethod(this.directLogin(), 'label');
                 deferredResult.addMethod(this, 'updateWindowWithDirectLoginLabel', aWindow);
                 deferredResult.collectResults({
                                 'type':                         MochiKit.Base.method(this.directLogin(), 'type'),
                                 'label':                MochiKit.Base.method(this.directLogin(), 'label'),
                                 'formAttributes':MochiKit.Base.method(this.directLogin(), 'formAttributes'),
                                 'inputValues':  MochiKit.Base.method(this.directLogin(), 'inputValues')
                 });
-//deferredResult.addCallback(function (aValue) { console.log("SOME ATTRIBUTES", aValue); return aValue; });
                 deferredResult.addCallback(MochiKit.Base.bind(function (someAttributes) {
-//console.log("SOME ATTRIBUTES", someAttributes);
                         switch (someAttributes['type']) {
                                 case 'http_auth':
                                         this.runHttpAuthDirectLogin(aWindow, someAttributes);
                                         break;
                                 case 'simple_url':
                                         this.runSimpleUrlDirectLogin(aWindow, someAttributes);
                                         break;
                                 default:
                                         this.runSubmitFormDirectLogin(aWindow, someAttributes);
                                         break;
                         }
                 }, this));
                 deferredResult.callback();
-//console.log("<<< runDirectLogin");
 
                 return deferredResult;
         },
 
         //=============================================================================
 
         'run': function () {
                 var newWindow;
 
                 newWindow = window.open(Clipperz.PM.Strings.getValue('directLoginJumpPageUrl'), this.target());
 
                 return this.runDirectLogin(newWindow);
         },
         
         //=============================================================================
 
         'test': function () {
                 var iFrame;
                 var newWindow;
 
                 iFrame = MochiKit.DOM.createDOM('iframe');
                 MochiKit.DOM.appendChildNodes(MochiKit.DOM.currentDocument().body, iFrame);
 
                 newWindow = iFrame.contentWindow;
 
                 return this.runDirectLogin(newWindow);
         },
         
         //=============================================================================
         __syntaxFix__: "syntax fix"
 });
 
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.UI.Common.Controllers.DirectLoginRunner.openDirectLogin = function (aDirectLogin) {
                 varrunner;
         
         runner = new Clipperz.PM.UI.Common.Controllers.DirectLoginRunner({directLogin:aDirectLogin});
         return runner.run();
 };
 
 //-----------------------------------------------------------------------------
 
 Clipperz.PM.UI.Common.Controllers.DirectLoginRunner.testDirectLogin = function (aDirectLogin) {
                 varrunner;
 
-//console.log(">>>>>> TESTING DIRECT LOGIN");
         runner = new Clipperz.PM.UI.Common.Controllers.DirectLoginRunner({directLogin:aDirectLogin});
         return runner.test();
 };
 
 //-----------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/ProgressBarController.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/ProgressBarController.js
index 41fe17f..52d81d4 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/ProgressBarController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/ProgressBarController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Controllers');
 
 Clipperz.PM.UI.Common.Controllers.ProgressBarController = function(args) {
         args = args || {};
 
                 this._numberOfSteps= 0;
                 this._currentStep= 0;
 
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'initProgress',     this, 'initProgressHandle');
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'updateProgress',this, 'updateProgressHandle');
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'advanceProgress',this, 'advanceProgressHandle');
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'progressDone',     this, 'progressDoneHandle');
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Common.Controllers.ProgressBarController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Common.Controllers.ProgressBarController";
         },
 
         //-----------------------------------------------------------------------------
         
         'numberOfSteps': function() {
                 return this._numberOfSteps;
         },
         
         'setNumberOfSteps': function (aValue) {
                 this._numberOfSteps = aValue;
         },
 
         'updateNumberOfSteps': function (aValue) {
                 this._numberOfSteps += aValue;
         },
 
         //-----------------------------------------------------------------------------
 
         'currentStep': function() {
                 return this._currentStep;
         },
 
         'advanceCurrentStep': function () {
                 this._currentStep ++;
         },
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/TabPanelController.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/TabPanelController.js
index 341fde9..d3e86de 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/TabPanelController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/TabPanelController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Controllers');
 
 Clipperz.PM.UI.Common.Controllers.TabPanelController = function(args) {
         args = args || {};
 
                 this._component                 = args.component;
                 this._configuration = args.configuration;
                 this._isEnabled                 = args.enabled || true;
 
         this._selectedTab = null;
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Common.Controllers.TabPanelController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Common.Controllers.TabPanelController";
         },
 
         //-----------------------------------------------------------------------------
         
         'component': function() {
                 return this._component;
         },
         
         'configuration': function() {
                 return this._configuration;
         },
 
         //-----------------------------------------------------------------------------
 
         'getElement': function(anElementID) {
                 return this.component().getElement(anElementID);
         },
 
         'tabForTabElement': function(anElement) {
                         varresult;
                 
                 for (result in this.configuration()) {
                         if (this.getElement(this.configuration()[result]['tab']) == anElement) {
                                 break;
                         }
                 }
                 
                 return result;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/WizardController.js b/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/WizardController.js
index ef38bc6..c13d96a 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/WizardController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Common/Controllers/WizardController.js
@@ -1,28 +1,26 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
         //Still empty, but here it should be reasonable to factor in code duplicated between
         //- DirectLoginWizardController
         //- NewUserWizardController
\ No newline at end of file
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Compact/MainController.js b/frontend/gamma/js/Clipperz/PM/UI/Compact/MainController.js
index ea987cd..f0ccdfb 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Compact/MainController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Compact/MainController.js
@@ -1,56 +1,54 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Compact');
 
 Clipperz.PM.UI.Compact.MainController = function() {
         //this._loginPanel = null;
         //this._user = null;
 //
         //this._isRunningCompact = false;
         //
         //Clipperz.NotificationCenter.register(null, 'userConnected', this, 'userConnectedCallback');
         //Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'switchLanguageHandler');
 //
         //Clipperz.NotificationCenter.register(null, 'EXCEPTION', this, 'reportException');
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Compact.MainController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Compact.MainController";
         },
 
         //-----------------------------------------------------------------------------
 
         'run': function(shouldShowRegistrationForm) {
-MochiKit.Logging.logDebug("running " + this.toString());
+                Clipperz.logDebug("running " + this.toString());
         },
         
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
\ No newline at end of file
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardDetail.js b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardDetail.js
index 32dfa63..abf4758 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardDetail.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardDetail.js
@@ -1,216 +1,211 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Mobile.Components');
 
 Clipperz.PM.UI.Mobile.Components.CardDetail = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Mobile.Components.CardDetail.superclass.constructor.apply(this, arguments);
 
         //this._cardReference = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.CardDetail, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Mobile.Components.CardDetail component";
         },
 
         //-------------------------------------------------------------------------
 /*
         'cardReference': function () {
                 return this._cardReference;
         },
         
         'setCardReference': function (aValue) {
                 this._cardReference = aValue;
         },
 */
         //-------------------------------------------------------------------------
 
         'renderSelf': function () {
-console.log("CardDetail.renderSelf");
                 this.append(this.element(), {tag:'div', cls:'cardDetail', children:[
                         {tag:'div', cls:'toolbar', children:[
                                 {tag:'a', href:'#', cls:'back', html:"List"},
                                 {tag:'h1', id:this.getId('cardTitle'), html:"…"}
                         ]},
                         {tag:'div', cls:'scroll', id:this.getId('cardDetails'), children:[
                         ]}
                 ]});
         },
 /*
         'renderSelf': function() {
                 this.append(this.element(), [
                         {tag:'div', cls:'cardDetail', id:this.getId('cardDetail'), children:[
                                 {tag:'div', id:this.getId('progressBar')} //,
                         ]}
                 ]);
 
                 this.addComponent(new Clipperz.PM.UI.Common.Components.ProgressBar({'element':this.getElement('progressBar')}));
                 MochiKit.Signal.signal(Clipperz.PM.UI.Common.Controllers.ProgressBarController.defaultController, 'updateProgress', 0);
         },
 */
 
         'setTitle': function (aValue) {
                 this.getElement('cardTitle').innerHTML = aValue;
         },
 
         'fieldListElement': function () {
                         varresult;
 
                 result = this.getElement('fieldList');
                 if (result == null) {
                         result = this.append(this.getElement('cardDetails'), {tag:'ul', cls:'rounded', id:this.getId('fieldList')});
                 }
 
                 return result;
         },
 
         'renderFieldValues': function (someFieldValues) {
                         varfieldClass;
 
                 if ((someFieldValues['actionType'] != 'NONE') || (someFieldValues['label'] != '') && (someFieldValues['value'] != '')) {
                         if (someFieldValues['isHidden'] == true) {
                                 fieldClass = 'password';
                         } else {
                                 fieldClass = '';
                         }
 
                         this.append(this.fieldListElement(), {tag:'li', cls:'cardField', children:[
                                 {tag:'a', href:'#', cls:fieldClass, html:someFieldValues['value'], children:[
                                         {tag:'small', cls:'label', html:someFieldValues['label']}
                                 ]}
                         ]})
                 }
         },
 
         'addField': function (aField) {
                 var deferredResult;
                         varfieldValues;
 
                 fieldValues = {};
                 deferredResult = new Clipperz.Async.Deferred("CardDetail.addField", {trace:false});
                 deferredResult.addMethod(aField, 'label');
                 deferredResult.addCallback(function (aValue) { fieldValues['label'] = aValue; });
                 deferredResult.addMethod(aField, 'value');
                 deferredResult.addCallback(function (aValue) { fieldValues['value'] = aValue; });
                 deferredResult.addMethod(aField, 'actionType');
                 deferredResult.addCallback(function (aValue) { fieldValues['actionType'] = aValue; });
                 deferredResult.addMethod(aField, 'isHidden');
                 deferredResult.addCallback(function (aValue) { fieldValues['isHidden'] = aValue; });
                 deferredResult.addMethod(this, 'renderFieldValues', fieldValues);
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'directLoginElement': function () {
                         varresult;
 
                 result = this.getElement('directLoginList');
                 if (result == null) {
                         this.append(this.getElement('cardDetails'), {tag:'h2', html:"Direct login"});
                         result = this.append(this.getElement('cardDetails'), {tag:'ul', cls:'rounded', id:this.getId('directLoginList')});
                 }
 
                 return result;
         },
 
         'addDirectLogin': function (aDirectLogin) {
                 this.append(this.directLoginElement(), {tag:'li', cls:'directLogin forward', children:[
                         {tag:'a', href:'#', html:"direct login", children:[
                                 {tag:'small', cls:'favicon', children:[{tag:'img', cls:'favicon', src:'http://www.clipperz.com/favicon.ico'}]}
                         ]}
                 ]})
 
-console.log("ADD DIRECT LOGIN", aDirectLogin);
         },
 
         //=========================================================================
 
         'showCard': function (aCard) {
                 var deferredResult;
 
         //      this.render();
 
-console.log("CardDetail.showCard", aCard);
                 deferredResult = new Clipperz.Async.Deferred("CardDetail.showCard", {trace:false});
                 deferredResult.addMethod(aCard, 'label');
                 deferredResult.addMethod(this, 'setTitle');
 
                 deferredResult.addMethod(aCard, 'fields');
                 deferredResult.addCallback(MochiKit.Base.values);
                 deferredResult.addCallback(MochiKit.Base.map, MochiKit.Base.method(this, 'addField'));
 
                 deferredResult.addMethod(aCard, 'directLogins');
                 deferredResult.addCallback(MochiKit.Base.values);
                 deferredResult.addCallback(MochiKit.Base.map, MochiKit.Base.method(this, 'addDirectLogin'));
 
 
                 deferredResult.callback();
 
                 return deferredResult;
         //      return Clipperz.Async.callbacks("CardDialogController.updateComponentState", [
         //              MochiKit.Base.method(this.record(), 'hasPendingChanges'),
         //              MochiKit.Base.method(this.cardDialogComponent(), 'setShouldEnableSaving'),
         //        
         //              MochiKit.Base.method(this.record(), 'label'),
         //              MochiKit.Base.method(this.cardDialogComponent(), 'setTitle'),
         //              MochiKit.Base.method(this.record(), 'notes'),
         //              MochiKit.Base.method(this.cardDialogComponent(), 'setNotes'),
         //        
         //              MochiKit.Base.method(this.record(), 'fields'),
         //              MochiKit.Base.values,
         //              MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.method(this, 'addCardDialogComponentWithField')),
 //
         //              MochiKit.Base.method(this.record(), 'directLogins'),
         //              MochiKit.Base.values,
         //              MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.method(this, 'addCardDialogComponentWithDirectLogin')),
 //
         //              MochiKit.Base.method(this.cardDialogComponent(), 'resetNewFieldInputs'),
         //              MochiKit.Base.noop
         //      ], {trace:false});
 
         },
 
         //=========================================================================
 
         'showCardDetails': function (someData) {
                 this.element().innerHTML = '';
                 this.append(this.element(), [
                         {tag:'fieldset', id:this.getId('fields'), children:MochiKit.Base.map(function (aFieldData) {
                                 return {tag:'div', cls:'row', children:[
                                         {tag:'label', html:aFieldData['label']},
         //                                      {tag:'span', cls:('fieldValue ' + (aFieldData['isHidden']? 'password' : 'text')), html:aFieldData['value']}
@@ -221,79 +216,78 @@ console.log("CardDetail.showCard", aCard);
 
                                 ]}
                         }, someData['fields'])}
                 ]);
 
                 MochiKit.Iter.forEach(MochiKit.Selector.findChildElements(this.element(), ['span.password']), MochiKit.Base.bind(function (aPasswordElement) {
                         MochiKit.Signal.connect(aPasswordElement, 'onclick', function (anEvent) { alert(MochiKit.DOM.scrapeText(anEvent.src())); })
                 }, this));
 
                 if (someData['directLogins'].length > 0) {
                         this.append(this.element(), [
                                 {tag:'h2', html:"Direct logins"},
                                 {tag:'fieldset', id:this.getId('directLogins'), children:MochiKit.Base.map(function (aDirectLoginData) {
                                         return {tag:'div', cls:'row', id:('directLogin_' + aDirectLoginData['_reference']), children:[
                                                 {tag:'img', cls:'favicon', src:aDirectLoginData['favicon']},
         //                                      {tag:'input', cls:'directLogin', disabled:'disabled', type:'text', name:aDirectLoginData['label'], value:aDirectLoginData['label']}
                                                 {tag:'span', cls:'directLogin', html:aDirectLoginData['label']}
                                         ]}
                                 }, someData['directLogins'])}
                         ]);
 
                         MochiKit.Base.map(MochiKit.Base.bind(function (aRowNode) {
                                         MochiKit.Signal.connect(aRowNode, 'onclick', this, 'directLoginClickHandler');
                                 }, this),
                                 MochiKit.Selector.findChildElements(this.getElement('directLogins'), ['div.row'])
                         )
                 };
                 
                 if (someData['notes'] != '') {
                         this.append(this.element(), [
                                 {tag:'h2', html:"Notes"},
                                 {tag:'fieldset', id:this.getId('fieldset'), children:[
                                         {tag:'div', cls:'row notes', children:[
                                                 {tag:'span', html:someData['notes']}
                                         ]}
                                 ]}
                         ]);
                 };
 
                 return true;
         },
 
         //-------------------------------------------------------------------------
 /*
         'toggleClickHandler': function (anEvent) {
                         varnextState;
                         varfieldValue;
                 
-//console.log("TOGGLE");
                 anEvent.preventDefault;
                 fieldValue = MochiKit.Selector.findChildElements(anEvent.src().parentNode.parentNode, ['span.password'])[0];
 
                 nextState = (MochiKit.DOM.getNodeAttribute(anEvent.src(), 'toggled') != 'true');
                 if (nextState) {
                         MochiKit.DOM.removeElementClass(fieldValue, 'clear');
                 } else {
                         MochiKit.DOM.addElementClass(fieldValue, 'clear');
                 }
                 
                 MochiKit.DOM.setNodeAttribute(anEvent.src(), 'toggled', nextState);
         },
 * /
         //=========================================================================
 /*
         'directLoginClickHandler': function (anEvent) {
                 anEvent.preventDefault();
                 
                 if (/(directLogin_)/.test(anEvent.src().id)) {
                         var directLoginReference;
                         
                         directLoginReference = anEvent.src().id.match(/(directLogin_)(.*)/)[2];
                         MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'selectedDirectLogin', {cardReference:this.cardReference(), directLoginReference:directLoginReference});
                 }
         },
 */
         //=========================================================================
 
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardList.js b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardList.js
index a4aa212..a0e4879 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardList.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/CardList.js
@@ -1,222 +1,216 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Mobile.Components');
 
 Clipperz.PM.UI.Mobile.Components.CardList = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Mobile.Components.CardList.superclass.constructor.apply(this, arguments);
 
         this._cardDetail = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.CardList, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Mobile.Components.CardList component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function () {
                 this.append(this.element(), {tag:'div', cls:'cardList', children:[
                         {tag:'div', cls:'toolbar', children:[
                                 {tag:'h1', html:"clipperz"},
         //                      {tag:'input', name:'search', type:'search', autocomplete:'off', placeholder:"search", id:this.getId('search')},
                                 {tag:'a', href:'#', id:'settings', cls:'button', html:"*"}
                         ]},
                         {tag:'div', cls:'scroll', id:this.getId('listBox'), children:[
                                 {tag:'ul', cls:'rounded', id:this.getId('list'), children:[
                                         {tag:'li', html:'loading'}
                                 ]}
                         ]}
                 ]});
 
                         MochiKit.Signal.connect(this.getElement('list'),                        'onclick',      this, 'cardSelectionHandler');
                         MochiKit.Signal.connect(this.getElement('list'),                        'ontouchstart',this, 'cardSelectionHandler');
         //              MochiKit.Signal.connect(this.getElement('cardListSearchForm'),  'onsubmit',             this,'searchHandler');
         //              MochiKit.Signal.connect(this.getElement('cardListSearchForm'),  'onkeydown',    this,'searchHandler');
         //              MochiKit.Signal.connect(this.getElement('cardListSearchForm'),  'onkeyup',              this,'searchHandler');
                 
         //              MochiKit.Signal.connect(this.getElement('cardListPanel'),               'onclick',              this,'cardListClickHandler');
         //              MochiKit.Signal.connect('backButton',   'onclick',              this,'backButtonClickHandler');
 
         //      MochiKit.Style.hideElement('backButton');
         //      MochiKit.Style.hideElement(this.getElement('cardDetail'));
         },
 
         'showCards': function (someCards) {
                         varcardListElement;
                 if (this.isFullyRendered() == false) {
                         this.render();
                 };
 
                 cardListElement = this.getElement('list')
 
                 cardInfo = {
                                 '_rowObject':           MochiKit.Async.succeed,
                                 '_reference':           MochiKit.Base.methodcaller('reference'),
                                 '_searchableContent':MochiKit.Base.methodcaller('searchableContent'),
                                 'label':                        MochiKit.Base.methodcaller('label'),
                                 'favicon':                      MochiKit.Base.methodcaller('favicon')
                 };
 
-//console.log("someCards", someCards);
                 deferredResult = new Clipperz.Async.Deferred("CardList.showCards", {trace:false});
                 deferredResult.addCallback(MochiKit.Base.map, Clipperz.Async.collectResults("CardList.value - collectResults", cardInfo, {trace:false}));
                 deferredResult.addCallback(Clipperz.Async.collectAll);
                 deferredResult.addCallback(MochiKit.Base.methodcaller('sort', Clipperz.Base.caseInsensitiveKeyComparator('label')));
                 deferredResult.addCallbackPass(MochiKit.DOM.replaceChildNodes, cardListElement);
         //      deferredResult.addCallbackPass(MochiKit.DOM.removeElementClass, cardListElement, 'loading');
                 deferredResult.addCallback(MochiKit.Base.map, MochiKit.Base.method(this, 'appendCardToList', cardListElement));
                 deferredResult.callback(someCards);
         },
 
         'appendCardToList': function (aCardListElement, aCardInfo) {
-//console.log("appendCardToList", aCardInfo);
                 this.append(aCardListElement, {tag:'li', cls:'cardListItem arrow', cardreference:aCardInfo['_reference'], children:[
                         {tag:'a', href:'#', html:aCardInfo['label'], children:[
                                 {tag:'small', cls:'favicon', children:[{tag:'img', cls:'favicon', src:aCardInfo['favicon']}]}
                         ]}
                 ]});
         },
 
         'cardSelectionHandler': function (anEvent) {
                 var listElement;
                         varcardReference;
 
                 anEvent.preventDefault();
 
                 listElement = anEvent.target();
                 if (MochiKit.DOM.getNodeAttribute(listElement, 'cardreference') == null) {
                         listElement = MochiKit.DOM.getFirstParentByTagAndClassName(anEvent.target(), tagName='li', className='cardListItem');
                 }
                 cardReference = MochiKit.DOM.getNodeAttribute(listElement, 'cardreference');
-console.log("###", listElement, cardReference);
                         //TODO: Notify card with reference MochiKit.DOM.getNodeAttribute(listElement, 'cardreference') has been selected
                 MochiKit.Signal.signal(this, 'selectedCard', cardReference);
         },
 
         //-------------------------------------------------------------------------
 /*
         'searchHandler': function (anEvent) {
                         if ((typeof(anEvent.key()) != 'undefined') && (anEvent.key().string == 'KEY_ENTER')) {                          //RETURN
                         anEvent.preventDefault();
                 } else {
                         if ((typeof(anEvent.key()) != 'undefined') && (anEvent.key().string == 'KEY_ESCAPE')) {
                                 anEvent.target().value = "";
                         }
         
                         if (anEvent.type() == 'keyup') {
                                 MochiKit.Signal.signal(this, 'searchEvent', anEvent.target().value);
                         }
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'update': function (someObjects) {
                         varcardListPanel;
                 var i,c;
 
                 cardListPanel = this.getElement('cardListPanel');
                 cardListPanel.innerHTML = '';
 
                 c = someObjects.length;
                 
                 for (i=0; i<c; i++) {
                         this.append(cardListPanel, {tag:'li', cls:'cardListItem', id:('cardListItem_' + someObjects[i]['_reference']), children:[
                                 {tag:'img', src:(someObjects[i]['favicon'] ? someObjects[i]['favicon'] : 'data:application/octet-stream;charset=utf-8;base64,AAABAAEAFxcAAAEAGAD8BgAAFgAAACgAAAAXAAAALgAAAAEAGAAAAAAAAAAAABIXAAASFwAAAAAAAAAAAAD///////////////////////////////////////////////////////////////////////////////////////////9zAC////////////////////////////////////////////////////////////////////////////////////////////9pAG////////////////////////////////////////////////////////////////////////////////////////////9rAC////////////////////////////////////////////////////////////////////////////////////////////9yAHP////////////////////////IyMizs7O6urrq6ur////////////Ozs6zs7Ozs7Pq6ur///////////////////////8AAAD////////////////////V1dWXl5eXl5eXl5elpaX4+Pj////Ozs6Xl5eXl5eXl5eenp7///////////////////////8AAAD////////////////////Ozs6Xl5eXl5eXl5eXl5fBwcHq6uqenp6Xl5eXl5eXl5eXl5f///////////////////////8AAAD////////////////////j4+OXl5eXl5eXl5eXl5eXl5elpaWXl5eXl5eXl5eXl5ezs7P///////////////////////8AAAD////////////////////////IyMiXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eenp7x8fH////////////////////////////////////////////////////4+PilpaWXl5eXl5eXl5eXl5eXl5eXl5eXl5fOzs7////////////////////////////////////////////////////////q6uq6urqXl5eXl5eXl5eXl5eXl5eXl5eenp7V1dX4+Pj///////////////////////8AAAD////////////4+PjOzs6lpaWXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5e6urrj4+P///////////////8AAAD////////////BwcGXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5fx8fH///////////8AAAD///////////+zs7OXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5eXl5fj4+P///////////8AAAD////////////IyMiXl5eXl5eXl5eXl5e6urqXl5eXl5eXl5eXl5esrKylpaWXl5eXl5eXl5eenp7x8fH///////////8AAAD////////////////Ozs7Ozs7V1dX4+Pj///+Xl5eXl5eXl5eXl5fOzs7////q6urOzs7Ozs7q6ur///////////////8AAAD///////////////////////////////////+Xl5eXl5eXl5eXl5fOzs7///////////////////////////////////8AAAD///////////////////////////////////+Xl5eXl5eXl5eXl5fOzs7///////////////////////////////////8AAAD///////////////////////////////////+Xl5eXl5eXl5eXl5fOzs7///////////////////////////////////8AAAD////////////////////////////////////IyMiXl5eXl5eenp7x8fH///////////////////////////////////8AAAD////////////////////////////////////////j4+Pj4+Px8fH///////////////////////////////////////8AAAD///////////////////////////////////////////////////////////////////////////////////////////8AAAD///////////////////////////////////////////////////////////////////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAo=')},
                                 {tag:'a', id:('cardListReference_' + someObjects[i]['_reference']), href:'#', html:someObjects[i]['label']}
                         ]})
                         
                         MochiKit.Signal.connect('cardListItem_' + someObjects[i]['_reference'], 'onclick', this, 'cardListClickHandler');
                 }
 
         },
 
         'cardListClickHandler': function (anEvent) {
                 anEvent.preventDefault();
 
                 if (/(cardListReference_|cardListItem_)/.test(anEvent.target().id)) {
                         var cardListReference;
                         
                         cardListReference = anEvent.target().id.match(/(cardListReference_|cardListItem_)(.*)/)[2];
-//console.log("Showing detail for card named", cardListReference);
                         MochiKit.Signal.signal(this, 'selectedCard', cardListReference);
                 }
         },
 
         //=========================================================================
 
         'cardDetail': function (someData) {
                 if (this._cardDetail == null) {
                         this._cardDetail = new Clipperz.PM.UI.Mobile.Components.CardDetail({element:this.getElement('cardDetail')});
                 }
                 
                 return this._cardDetail;
         },
 
         //-------------------------------------------------------------------------
 
         'removeCardDetail': function () {
                 if (this._cardDetail != null) {
                         this._cardDetail.remove();
                         this._cardDetail = null;
                 }
         },
 
         //=========================================================================
 
         'showCard': function (someData) {
                         vardeferredResult;
                         varoffset;
 
                 offset = ((MochiKit.DOM.getNodeAttribute(MochiKit.DOM.currentDocument().body, 'orientation') == 'portrait') ? 320 : 480);
                 this.cardDetail().render();
                 this.cardDetail().setCardReference(someData['_reference']);
                 MochiKit.Style.setElementPosition(this.cardDetail().element(), {x:offset});
                 new MochiKit.Visual.Sequence([
         //              new MochiKit.Visual.Move(this.cardDetail().element(), {x:offset, y:45, mode:'absolute', duration:0, sync:true}),
                         new MochiKit.Visual.Parallel([
                                         new MochiKit.Visual.Move(this.getElement('cardList'),           {x:-offset, y:0, mode:'relative',transition:MochiKit.Visual.Transitions.linear, sync:true}),
                                         new MochiKit.Visual.Move(this.getElement('cardDetail'),                 {x:0, y:45,              mode:'absolute',transition:MochiKit.Visual.Transitions.linear, sync:true}),
         //                      new MochiKit.Visual.ScrollTo('toolbar', {sync:true}),
                                         MochiKit.Visual.appear  ('backButton',                                          {                                                               transition:MochiKit.Visual.Transitions.linear, sync:true})
                         ], {duration:1, sync:true}),
                         MochiKit.Visual.fade(this.getElement('cardList'), {duration:0, sync:true})
                 ], {})
 
                 MochiKit.DOM.getElement('pageTitle').innerHTML = someData['title'];
 
                 return true;
         },
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/LoginForm.js b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/LoginForm.js
index eafcdbc..3aeac0c 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/LoginForm.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Components/LoginForm.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Mobile.Components');
 
 Clipperz.PM.UI.Mobile.Components.LoginForm = function(args) {
         args = args || {};
 
         this._pin = '';
 
         this._message = null;
         this._steps = 0;
         this._actualSteps = 0;
 
         this._callback = null;
         this._errorCallback  = null;
 
         this._mode = 'CREDENTIALS';
 
         Clipperz.PM.UI.Mobile.Components.LoginForm.superclass.constructor.apply(this, arguments);
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Mobile.Components.LoginForm component";
         },
 
         //-------------------------------------------------------------------------
 
         'callback': function () {
                 return this._callback;
         },
 
         'errorCallback': function () {
                 return this._errorCallback;
         },
 
         //-------------------------------------------------------------------------
 
         'mode': function () {
                 return this._mode;
@@ -94,97 +92,96 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
                 this._username = aValue;
         },
 
         //..........................................................................
 
         'passphrase': function () {
                 return this._passphrase;
         },
 
         'setPassphrase': function (aValue) {
                 this._passphrase = aValue;
         },
 
         //-------------------------------------------------------------------------
 
         'message': function () {
                 return this._message;
         },
 
         '_setMessage': function (aValue) {
                 this._message = aValue;
 
                 if (aValue == null) {
                         MochiKit.Style.hideElement(this.getElement('credentialsMessage'));
                 } else {
                         this.getElement('message').innerHTML = aValue;
                         MochiKit.Style.showElement(this.getElement('credentialsMessage'));
                 }
         },
 
         'setMessage': function (aValue) {
                 this._setMessage(aValue);
                 MochiKit.DOM.removeElementClass(this.getElement('credentialsMessage'), 'error');
         },
 
         'setErrorMessage': function (aValue) {
                 this._setMessage(aValue);
                 MochiKit.DOM.addElementClass(this.getElement('credentialsMessage'), 'error');
         },
 
         //-------------------------------------------------------------------------
 
         'setCallbacks': function (args) {
                 this._callback = args['callback'];
                 this._errorCallback = args['errorCallback'];
         },
 
         'showErrors': function (args) {
-//console.log("LoginForm.showErrors", args);
                 if (args['previousFailedAttempt'] == 'LOGIN') {
                         this.setErrorMessage("Wrong credentials");
                 } else if (args['previousFailedAttempt'] == 'PIN') {
                         if (args['failedAttempts'] == -1) {
                                 this.setErrorMessage("Wrong PIN - Resetted");
                         } else {
                                 this.setErrorMessage("Wrong PIN");
                         }
                 } else {
                         this.setMessage(null);
                 }
         },
 
         'updateWithArgs': function (args) {
                 this.renderIfNeeded();
                 this.setCallbacks(args);
                 this.showErrors(args);
                 this.updateRendering();
         },
 
         'showPinLogin': function (args) {
                 this.setPin('');
                 this.setMode('PIN');
                 this.updateWithArgs(args);
 
         //      $(this.getAnchor('PIN')).focus();
                 this.getElement('PIN').focus();
         },
 
         'showCredentialsLogin': function (args) {
                 this.setMode('CREDENTIALS');
                 this.updateWithArgs(args);
 
                 if (this.getElement('usernameField').value.length == 0) {
         //              $(this.getAnchor('usernameField')).focus();
                         this.getElement('usernameField').focus();
                 } else {
         //              $(this.getAnchor('passphraseField')).focus();
                         this.getElement('passphraseField').focus();
                         this.getElement('passphraseField').select();
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'renderIfNeeded': function () {
                 if (this.isFullyRendered() == false) {
                         this.render();
@@ -254,103 +251,97 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
                                                         {tag:'div', cls:'bar01'},
                                                         {tag:'div', cls:'bar02'},
                                                         {tag:'div', cls:'bar03'},
                                                         {tag:'div', cls:'bar04'},
                                                         {tag:'div', cls:'bar05'},
                                                         {tag:'div', cls:'bar06'},
                                                         {tag:'div', cls:'bar07'},
                                                         {tag:'div', cls:'bar08'},
                                                         {tag:'div', cls:'bar09'},
                                                         {tag:'div', cls:'bar10'},
                                                         {tag:'div', cls:'bar11'},
                                                         {tag:'div', cls:'bar12'}
                                                 ]}
                                         ]},
                                         {tag:'div', id:this.getId('loadingMessage')},
                                         {tag:'a',  href:'#', cls:'grayButton', id:this.getId('loginCancelButton'), html:"Cancel"}
                                 ]}
                                 //==================================================================
                         ]}
                 ]});
 
                         MochiKit.Signal.connect(this.getElement('credentialsForm'),                     'onsubmit',     this, 'submitCredentialsHandler');
                         MochiKit.Signal.connect(this.getElement('credentialsSubmitButton'),     'onclick',      this, 'submitCredentialsHandler');
 
                         MochiKit.Signal.connect(this.getElement('pinForm'),                                     'onsubmit',     this, 'submitPinHandler');
                         MochiKit.Signal.connect(this.getElement('pinSubmitButton'),                     'onclick',      this, 'submitPinHandler');
 
                         MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'initProgress',     this, 'initProgressHandle');
                         MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'updateProgress',this, 'updateProgressHandle');
                         MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'advanceProgress',this, 'advanceProgressHandle');
                         MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'progressDone',     this, 'progressDoneHandle');
         },
 
         //-------------------------------------------------------------------------
 
         'submitPinHandler': function (anEvent) {
                         varpin;
 
                 this.setMessage(null);
                 pin = this.getElement('PIN').value;
         //      $(this.getAnchor('PIN')).blur();
                 this.getElement('PIN').blur();
 
                 credentials = Clipperz.PM.PIN.credentialsWithPIN(pin);
                 this.loginWithCredentials(credentials);
         },
 
         'submitCredentialsHandler': function (anEvent) {
-//console.log("submitCredentialsHandler");
                         varcredentials;
 
                 this.setMessage(null);
 
                 credentials = {};
                 credentials['username'] = this.getElement('usernameField').value;
                 credentials['passphrase'] = this.getElement('passphraseField').value;
         //      $(this.getAnchor('passphraseField')).blur();
                 this.getElement('passphraseField').blur();
 
                 this.loginWithCredentials(credentials);
         },
 
         //-------------------------------------------------------------------------
 
         'loginWithCredentials': function (someCredentials) {
                         varargs;
 
                 args = {};
                 args['credentials'] = someCredentials;
                 args['errorCallback'] = this.errorCallback();
 
                 MochiKit.Style.hideElement(this.getElement('credentialsBody'));
                 MochiKit.Style.showElement(this.getElement('validating'));
 
                 MochiKit.Async.callLater(0.1, this.callback(), args);
         },
 
         //-------------------------------------------------------------------------
 
         'initProgressHandle': function (anEvent) {
-//console.log("** initProgressHandle", anEvent);
                 this._steps = anEvent['steps'];
                 this._actualSteps = 0;
         },
 
         'updateProgressHandle': function (anEvent) {
-//console.log("** updateProgressHandle", anEvent);
                 this._steps += anEvent['extraSteps'];
         },
 
         'advanceProgressHandle': function (anEvent) {
-//console.log("** advanceProgressHandle", anEvent);
                 this._actualSteps ++;
-//console.log("STEPS: " + this._actualSteps + "/" + this._steps);
         },
 
         'progressDoneHandle': function (anEvent) {
-//console.log("** progressDoneHandle", anEvent);
         },
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Controllers/MainController.js b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Controllers/MainController.js
index 12a61f7..9951f44 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Mobile/Controllers/MainController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Mobile/Controllers/MainController.js
@@ -1,393 +1,381 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Mobile.Controllers');
 
 Clipperz.PM.UI.Mobile.Controllers.MainController = function() {
-                this._jQTouch   = null;
+        //      this._jQTouch   = null;
                 this._user              = null;
                 this._proxy             = null;
                 this._loginForm = null;
                 this._cardList  = null;
                 this._cardDetail= null;
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Mobile.Controllers.MainController.prototype, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Mobile.Controllers.MainController";
         },
 
         //-------------------------------------------------------------------------
 
         'user': function () {
                 return this._user;
         },
 
         'setUser': function (aValue) {
                 this._user = aValue;
         },
 
         //-------------------------------------------------------------------------
-
+/*
         'jQTouch': function () {
                 return this._jQTouch;
         },
 
         'setJQTouch': function (aValue) {
                 this._jQTouch = aValue;
         },
-
+*/
         //=========================================================================
 
         'run': function () {
-                console.log("MainController.run");
-
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'doLogin', MochiKit.Base.method(this, 'doLogin'));
                 Clipperz.DOM.Helper.overwrite(MochiKit.DOM.currentDocument().body, {tag:'div', id:'jqt', children:[
                         {tag:'div', id:'loginForm'},
                         {tag:'div', id:'cardList'},
                         {tag:'div', id:'cardDetail'},
                         {tag:'div', id:'preferences'}
                 ]});
 
                 this.showLoginForm();
 
-                this.initjQTouch();
+        //      this.initjQTouch();
 
 
         //      this.showAddToHomeScreenBaloon();
         //      this.selectInitialProxy();
         },
-
+/*
         'initjQTouch': function () {
                 var jqt;
 
                 jqt = new $.jQTouch({
                         icon: 'data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAHIAAAByCAIAAAAAvxIqAAAD8GlDQ1BJQ0MgUHJvZmlsZQAAKJGNVd1v21QUP4lvXKQWP6Cxjg4Vi69VU1u5GxqtxgZJk6XpQhq5zdgqpMl1bhpT1za2021Vn/YCbwz4A4CyBx6QeEIaDMT2su0BtElTQRXVJKQ9dNpAaJP2gqpwrq9Tu13GuJGvfznndz7v0TVAx1ea45hJGWDe8l01n5GPn5iWO1YhCc9BJ/RAp6Z7TrpcLgIuxoVH1sNfIcHeNwfa6/9zdVappwMknkJsVz19HvFpgJSpO64PIN5G+fAp30Hc8TziHS4miFhheJbjLMMzHB8POFPqKGKWi6TXtSriJcT9MzH5bAzzHIK1I08t6hq6zHpRdu2aYdJYuk9Q/881bzZa8Xrx6fLmJo/iu4/VXnfH1BB/rmu5ScQvI77m+BkmfxXxvcZcJY14L0DymZp7pML5yTcW61PvIN6JuGr4halQvmjNlCa4bXJ5zj6qhpxrujeKPYMXEd+q00KR5yNAlWZzrF+Ie+uNsdC/MO4tTOZafhbroyXuR3Df08bLiHsQf+ja6gTPWVimZl7l/oUrjl8OcxDWLbNU5D6JRL2gxkDu16fGuC054OMhclsyXTOOFEL+kmMGs4i5kfNuQ62EnBuam8tzP+Q+tSqhz9SuqpZlvR1EfBiOJTSgYMMM7jpYsAEyqJCHDL4dcFFTAwNMlFDUUpQYiadhDmXteeWAw3HEmA2s15k1RmnP4RHuhBybdBOF7MfnICmSQ2SYjIBM3iRvkcMki9IRcnDTthyLz2Ld2fTzPjTQK+Mdg8y5nkZfFO+se9LQr3/09xZr+5GcaSufeAfAww60mAPx+q8u/bAr8rFCLrx7s+vqEkw8qb+p26n11Aruq6m1iJH6PbWGv1VIY25mkNE8PkaQhxfLIF7DZXx80HD/A3l2jLclYs061xNpWCfoB6WHJTjbH0mV35Q/lRXlC+W8cndbl9t2SfhU+Fb4UfhO+F74GWThknBZ+Em4InwjXIyd1ePnY/Psg3pb1TJNu15TMKWMtFt6ScpKL0ivSMXIn9QtDUlj0h7U7N48t3i8eC0GnMC91dX2sTivgloDTgUVeEGHLTizbf5Da9JLhkhh29QOs1luMcScmBXTIIt7xRFxSBxnuJWfuAd1I7jntkyd/pgKaIwVr3MgmDo2q8x6IdB5QH162mcX7ajtnHGN2bov71OU1+U0fqqoXLD0wX5ZM005UHmySz3qLtDqILDvIL+iH6jB9y2x83ok898GOPQX3lk3Itl0A+BrD6D7tUjWh3fis58BXDigN9yF8M5PJH4B8Gr79/F/XRm8m241mw/wvur4BGDj42bzn+Vmc+NL9L8GcMn8F1kAcXjEKMJAAAAACXBIWXMAAAsTAAALEwEAmpwYAAABbmlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iPgogICAgICAgICA8ZGM6c3ViamVjdD4KICAgICAgICAgICAgPHJkZjpCYWcvPgogICAgICAgICA8L2RjOnN1YmplY3Q+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgrlPw1BAAAd7klEQVR4nO19eZQV13nn797a3tr7yg5ikxCIHRohkACBEFqsJY4z8T52nPHYPp74JJ54bMfOsRMf2Z44OZ7EJ16iDLIsS5ZlydJY+2Ii1haiAQFCNGvTNHS/9/pt9Wq93/xRb+9u6OU1wif9O3Wq6223bv3qu7/vu9+9txqYwAQmMIEJTGACE5jABCbwnxTs/a4AHnjggY0bNwohxl4U5/xnP/tZe3v72Iv6g8fDDz9MlcOHP/zh9/uCAEB+vysA27YBkHAh7KK3aSRlMIDAFcZl13UrW73R4f2nNQvXYGYMjANUROkVyWXZvbBIDcLXOH4VHBGuGVoBgAMMYGAAERhAeekfyC8r+svA3n8nUYxrilYXxAFkScz6sKENlgHkfc5AYmSyMc64dmglEOW4pOyOUSlZxS9Y4RVjIHeEcjy+uGZoJYBErmlTdk/5V0NQxnLkUgXiswrimqEVAIkcTQU685+BioJsyikAkDXbCVqHABWslcpopcJfopIuTIFZMSECQ0GAWBGJA2j13mQspw8MeRumayJczeNaorVMW7MxVqkUgIEox6Yo7CdEYAhQji+UuKxyWgcFA0SWWbompODaoRUD7K40Hri8dJIgIVjRt99fXEu0FhNKpWabbfulYJTthjGAXLqW5PVapRUYwGyuj1AcGGTBQAJiQgQGotDFQkFkBwkGcpZbiAK8nqsgEsC10te6FmglAESCeZFAltPiMGvQSAtALhYAsrSSmLDWLIg8Wt0iQgdoa7nXKupm5TuvwgW5NEFrFp6kilyEVGAWGERSvT0rsWgwkEtZeZ2g1YNnX1llRIHNYlq9Dy6Tc4EgciHcPzwRuP/++9Pp9KuvvuoNk1QKRAQIKjBSrABFx9l2P2jvgIFcCAFyxyNunTVj2h/dt82nad/8zg+G+ZPh0ur3+7/70HdnXTdrz54927dvf+qpp7q7u0dbzxJkaaVSESjYbFHbz3NKJSksIOuySFTSZQX8/lvWrPjQg3dvWr92UktTV/eFH/30kYu9fcP57XBpXbOmbebMGURi1apVq1at+upX/9czTz+9/ZGf79q1a8yjciKrjCgKPEvcF8o7tRggBiRIuCQqE2DNnjXjvrs2P3jvHTfMn6sosmmayWSiqaF2w/q2X/zqt8MpYbi0Pvjgg4xzYaXgpIhrLY31f/aZP//EJz6+e/fu7du3P/3Ms5cuXRrlRQjynHhRp55KDgbpdJUIQDbf6hnsGKw1FAysu3nlnzxw94Z1bfX1dY5tO44BV6gwDVcmId+7dWMlaa2urr5j8+0kXLgW4yoTJukpwSQu+2+5Ze0t69Z9/aunnvnts9t//os9e/aO/MIIwi2JBMqZ9YS1zGXlDgRlIwHhQjijE4F5c2Y9eM8dH7hr8/Vzr+MSt03TTPerkutTuCSrINW2kpaptK1YNG3KpLNdV1a/YdG6fv26GTNnuJbByQWTwRQmSZKwyYoLMya4Nqml4bOf+++f/PhHd+7c9cijjz373O96+4alQQCIBIQrhFuqrQNsVgwwWO/TbEfLJRJCjEyOqsKhDevaPnT/tnVrVtbVVlu27ZhpmVl+iWRNYpIMcIDAFZU5KcdsrK3efNuan2z/1RVLHhatD95/Hxgn12CMgbw0vgBjjKuMXC4M0pOOLklycMNt6zZsuPXUyZO/efq3jz72RPv+t69culegtxXKH0DrQB3wDgi5/quLgt+7AhbMn/PgvVvu2bpp7uyZnDPbNKx0ROW2ooBzCVwCGIQAIxCBQ1EVltZdV7l787qfPvLkFVvklWltbGzccNt6YWUYOeBK9pqLXQqXGeOycMiOuWZEcN/USY3/44uf+/QnP/YfO3c98ugvf/fiy9FobKjyCUTCpWy/s6jkkoNSqS3skR0vIEFCkHAvf7011VWb1q/54/vvXLt6WU11tW2ZrpngyAS5KyscXAI4iCBcMMpOWgBBEJd9CqKm6Vu2aP6cWdOOd54ZK60bb1s/eXKrldEVr7kVsZGj2LMRxrgqMUcSGaEnbV1SpNDmjetu33jric7Op37z7GNP/Lrj0DuD8SqyXU+IrHqW8VvSNSjrdCH7KYmsvA4RCSxaMO/Be7bcs3XDdTOnc8ZsM+2kuzVmKpwYl8A4gKx5gmXbfvYAAIFLqkyGaVZXBbfc2lYBWh+47wMggrCYoiBvU0DBlLIXKbLHTOIS4+SQExHxXof5Zk5p/PKXPv+ZT33s9zvefPTxJ198+fX+eKLAKuWttcxlDTDYEmXIcQoAjMj1rLXMZdXX1tx+25oPfmDrmpVLqsJh28oIIyKTHuK2JDEwzzxF1iVmzbOYU++MHIIpisYyumPL226/+V8efsK5bFh5BVqnTpmybm2bbegcAkzKznIgKr0wkXtHZAc/iAAwLktMSCIjMklHl/xSeNuWW7du3nj8vfd+/fRzv3zymSPHjgPw4k0ityhuHZTZPK2D9LgYuQRBJNyc11qy6Po/uueOu7asnzl9GgM5ZkKkzviZoXABzzwJIBdMADyXEfemKnnH3mwwBpY9KVc0hSVM01w0f9YN82YdPPLe6GndvOm2pqYGQ0+qipQjseiCy7qSVEqHRzTjXFI4OYrb5yZ6BfPNmd70lb/8/H/79Eff2LHz4UceD/h9wnUgRDmVA5kt7hqIXMo1a7ACwhWO01BX88cf2PpfHty2avnicDDgWDrpFxSk/MzmHGBSzr95I7gsSxwxMAbGQBxEYLl9Yd4CgUk+hWUyZtAf2Lph9eVpvdyMMMbYs089dsfmjbaR0nwhICthOZPMbdmXOUdMBLjZg8KnORUWthC2Q7LLw5K/1rJhGBlVVbmTCIme3J27jPvK39ocoV7YKpwENTtyfSaTqQqHOBPCjMsirrGMxAisaNJc9oCVHGT3vGjPAF7yDpfITvdG01wJH363c+uffskwraGou5y1zr5u1uoVSy0jI3MGzpF3CESFrcRsaWhNyHk2xjlXVHIh+pxkrwyfxqtclzMigmBe4UPSivLj3I6RICJBIqQJnjmnIqkwh/Gcz/ES5IUpiGzAxnPdNZ4z5LywMoDAOASYrGk8plvW/FlTFi+YvXv/kdHQeueWjbU11YaelNRAzsGW+qtyTUCRBytuy6LoHuQsl0myRDLpqptwhOxCAs9rqyj9eZk4oLQO3idCdmM+iqtM53nz9NpNfg4s5ayVsQK/xLPBMssJQj6uyjLLCxVgkk9T0knDFwjcuWHVaGiVJeneu7Y4tsVATFJzjRrZRsGkrBV4zV84gAPk55rJhebPvD6lneUUZVwzzmWVuSCzkJwelNlifoGi9gGAGEOIp4rUMN8pYIWDPJtULAI5YSWWlVTPeIlyFFPhJUHVfFKy3zLljWsWPxTwp/TMyGi94fp5S2+60TIzmqqAK1lCyYGdgHEJ+jlkeqB3I9MFMwonBWHBixaYDK5BqYIShlYPtR5qPbQGyAFwDRAQTqny5oKY7LG4HLNsqN6Bd0fzg4zFhKJgsN5Bll9WOChQyQr+iigXJOReCmKy6pPchG3Omtq84qZ5r+06MDJa7966KRTwZwxD0kIw+hB/B5G30H8QyfeQPgs7CVE6U7d4CmUxOMBlKGH4WhCYjPBchGbBPwVKFZgMYQFOSc+isC8S2WJmB0lxFZ14YAWGVFWAeM6JFcWqlJvmhXw8kL/xAJP9fiWRMWUlsO225SOjVVXVbXdstB3B4wfZwR8jfgiZbm9MpETlhwlyYMZgxNB/FHgZnEFrRGg2ahai5kb4WsEVCCvX0Sp2WZcV2QKzrNxy84QWuGalNpu3guIDzzsxEM/63oIs5E4toGh+hfWZlrxu5Q211aFYPDVcWpfedOON82dbtu07sx3nXoAMMEAaNo8DwQrXCBCMS8hcQu9OyBpCs1G/HLVL4WsGOMgqUl5RwmNJQrbIa5U4MZQ2HFa6L9PWHJvFzT8byeZdmWe2yPcLmKT6VYrp1pTm2jVL5z/32iDLwAan6rOf+si6taudZLev8/uM9MtGt6NC3mLIRaYXsQ707kD6JJgMrR5czWW1Sw22oLmicFDwhKUDt1lac28ylN+M4o0V3R42YI+8TXg/55ysVNqQZcVx3f/3+lsDr28Qaw0GA1s23mLarhTbzY3eETT20cEr30mjdw/69iA0E03rUbccchCuVS61JRRjQGCAIXWgzGAHD12pYLnFCpv3ltnvQPUFVClhWmbb4tnNDTUX+/rLrmkQa13btvxzn/pTx3H8p34o6acrb6qDIn91Vj+iB9D/NiDga4akFSVSS0W2kJbNezYxiCWiKH4o2CYKRoqylyh6M49SlyjJZCXTGVETDhzpPH/kRFfZ1Qxiivdu3SjLEqwos/rAclW9avDsJnMBpx7Fse8hsjuX3i7rK3sKkGfcBTyP5w6yCe99J7sXInec/0L+uLgXXlaOyKVmBFxTljiERcLdesvCgYvCyq21vq7277/2xYBPcUmyGjba1ctJDjA3ye1EiQ8Yb3iWaycQexv6afiaoNYOYrPFCuvZLyu24sGkEwXnM0iSM29BeYvOvvT8mG0Z6VS8Pxrpj6dcIsZITGqpf+a1t+NJvbj65dpaU1PTr4sWpgb8ZJrMrl5pVa9mdkxJHVajv1fi+ySjuxCNjDe8U/QfReokmtajcT0kDcIq19ZiOkRx+82FBPluqxdpZV96LTUfsRYrbD4lyMEIwrIsR8/YaUOYFhPEOGc+nyakQHfMfvPAKcMub86DcOMPBJctWXzX1k0bb1k5e3qzyoVlmrZgIMacmJI8rMb+Q020S2bP1eMXgABC0zH5bgSmQtil6RgM5rtQFJaiaPVmPmWFLI8exWVJLAYIsmxHN9y0CdOWXMEkiWmaRrK/O+buPnT2+df37W7viEUHGQy9HCWBYGjZ0sXbNm/YtG7ldVMbFeaYpukIBjBmx+TUEV//m2qyXTIvXSV+CZA0tNyO+lUA5TJqZfkt76v5lFXRz7MdqhyhJblBno1bGSCEabm6ibTJTVcWgnHONE2D7L8QFzs7zjz/RvvetzqikcsNLQ+LiVAovHz50js337rx5uUzJ9fJcEzTyPOrpo9o8Z1a8m3J6h13fj2aapegdQskX26tvCgIAkoNtpjZgoWiQKuXnQFBkGmLtMl1SzZdxSUmsSybPQnadfDM82+8tbu9IxrpHU41R0ZAuKp6xfKl225ff9vNS6a31Mhk5+2X21FFP+KL79bSHZLVN778CiA4FVPugVoHYZcSStkeUZmdUqm1slyClYRpU9qS05ZquqogLnFoqgol0JOgXYfOvfBG++72jkjfsNgsPuFoUFVds3LF0m2333rr6oXTmqs4WZZh2h6/TlRNH/Un92rpg5IdGdt5hgYBai0m3w3/lFzWsTgILRNZrw4sqwwgEmTZSFtK2tZMVxPEOSefpkEO9CRo9+FzL/x+/659HZG+Uc6AGuvlVtfUrlq5bNumdetWLpjaFOaukbNfcCem6cd8qX0+/bBkRytxtlIQIPsx6S6EZmXDg9IkbHZNYtZIyWPTdFjaUnXbbwgtZ5sKU4IXE9j9zrnn39i/u72jr3e088lyqNiF1tTWrV65bNumW25ZccOUBj9cwzQMhyQQSU5Myxzzp9p9maOSE6vkaT0n1roFoTmlNlv8DUFCmLaUtrW07TeFTxCXGGmaytTgxQT2HDn//Bv7d+07MHY286i8+NXW1betXHbnprVrl82bXOeHq5uG6RAHSLKjmvFuIH3AZxyR3HhlzkcAV9C6BaHZEFbuLQJAwjVsnra1tBOwXJ8LLjFomsKU4KUk9h7pfmHH2zv3Hui9dLEyNSnCOMZEdfUNa1Yvv3PjzTcvnt1aq1qZpG074DKE3dLzkM94r6I2q6J1CwLTiz2YcO2uRH1a1HLmSpxrgareFPYevfDCjgM79x64dLGnQqcfBFcjlG9oaFq9atmXPrF1drNmu7y2/8ma+PPjo7NboTVCONm3GExTnE22giu9Kf7dR/fs2nfgYs+Fip54cIx31g8A+vouvXfkQLWccYgH0vuqEy+NSwLXyaDnFVj9YJRPoGiq0+S7IFwnLOvxC+9eHU4xtoz/cFFbFfzJ331mxtRWlulqivxUEplxaSQMcE1YUQSn5YYLCUQ+2XZs02Hhm2+asWP/yUhcv3JRY8a408oY+9YXP7ipbaFppJqjD2t29zgKDwPsFIQF/6RszhAEICDrKZ35/eEFsxqf33ncssd90fG40/qRe9d+/sO3G5Zbl3gmnNk/7mLOACsCOQC1Nve4IcE480vpaEqZ3FRXHVJff+vUOFdinGldcv2M7//Vh7ikBvX2huSzjF2tfLjRC18zJBVwvTFwWRYK9IjuWzS7uTemHz5ZsRB1UIwjrXXVwX/+2kcmN9dzs6s18XNO5vidqxzChZNCYFJhDJHIp9iObacs36oFre3HLlzoG2QgulIYL1o5Y9/6wn23rZxvGqnW5KOqc+kqpWU9MMBOg6vQaiGc7AgCQ1DNJHXGJf+S2Y0vt59OG5VcDlmM8aL1o/e0ffZD6zOW25j+Xdg8dFU59cAAKw5/E7iUHxtnHAFFj6TkxprQpMbgK+1nhRgXXRoXWpfdMP2hv7iPMTlk7G/KvPg+cOpBuCAbvgbAzU/LlWWhwuhLaXOn1tiOaD82LiJbeVrra0I//OsPtjTUSGbXJP1JjiHn1g4fBObCx71JicOHJwVqFSStMEWDyKfZruP069ryufXHz/Wf7kmOvYZlqDCtnLNvf+6utUuvs8zU5MyTmohc+TfDQIJd183XVtNJjhGGnEQQJnz12bHu7KA3hTQjlWGuUJfNrdtxsKc/VYF7X4wK0/qxu1f+2QOrM6bbYr4Udt6tSJk2AmfZBh2NAAujfKLDFcAA14AczAVb3ui3YJyCqh5JKOGgOnty+OX9F2ynkg8oqyStyxdM/fvP30lMqrY7mqw3KlXsebQl0crI1NHoR9THRphRJIAs+Gqy8oqcyCpC40ZvXJveHPCr0puHRzascnlUjNaGmuA//dU9TXXVitU9xXp2xDo4BGI0s4dukmVFVv2upaepqYadldhIAiMGuBYUPyRvAVQu3iLh1yzhuNGUsmhWuCdqvNtVMZGtDK0SZ9/+7Ja2hdMcMznV+q1K5VO9RgcLwTNiraJoz3ck955yls/UdJMsBGt5F8NIAiMCIKAGQE7OYL2NQj4jpTPDkpbPDe873t8br4zIVobWT9y97JP3LDFMp9V5vYoq1eNmZ90VGTREDPVLP3jx1Z2Hbm5b0RpIJu2QDCvEoyMpCRA2VB84gRzABhwv6mJMhLRMJKFqsnTjjMArB6KGVQGRrQCtqxZM+daf3yZIqnEONou9Yy/QQ8Sd2ePMUzXtO788tq/juOvYh08n7ly3ULEjSVEX5n0qN0ZQHBE4QeagHKdwAAfkyIrjk81Lca2lRmmslt84FB84aDtSjJXWxtrgD/5iS311UHW6p4lXRhwADQGTQqesFYqqvPKO+Y+PvE4kAPT1RVJUs2Fxo5nRdVFdJ1/gbNiWxQC4UBhgAhZgASZgAzbI8fsM4VJfUp0/WdNN9+DpseZkx0SrJPFvf+bWlTe0OlZqOr2soTKST2Cn7SWGqIrZvr/84Y54vOD63zl+dsacBTe0WClDEiTVKMN9GAQACIJsg9s5g/U2G8wCOeFAOq3L6Yy89DrtaFemKzKmdMGYBl0+vm3hllXTM4bZSrsDGMkVXha99rSY1aCoyv95uvPc+ZJhEhLOd37y4ul0k8rNi2ZzxGoaQc+YADu3uqx4E4AQnNmzWroVnpK58+X7aifVjekJYaO31tU3TvrGJ9oEsTpxpIV1jKUSxciI0CljoSrLb7wn/uHnO2jAv9DJ6OnOXtq6ZiYykYRTXadEZD68YM67AXLpxKwiyIrwK+bFqFwToBmN/LXDpjta7zVKWptrg//7C+trw37N7ZkuvclRmS4KgZ/M3GC4wYQT/PKP9sX6B4/8z3f3SOFpa+aqum4YQmvwRYdrsjQ0rQQQ/D4HwrnUL2Y2urIk9p4Y5XWNhlZZ4t/6dNuyeQ2ulZol7VBZhQbdGHrMKT3GJJ9P/YdnL7751rHLfLfj3a6FixbPDEcSpswhqrT0cM/C8wsrSk6dR1XQSet2Im0vnCbOR9E5qrkZo9HWj985f9Oy1kzGnCy95WeVifwBpJ3QeX2KT3Z3nMCTLw6+Oi8P28x8+2c7+9gMmTLnUnVxMzBckXUGW7UhChtjmDtFaDKRiy9sYXNaRnMtI7bWpddP/btPLXcsUxAx2CEek1gF+qkC/ERytumqKVH11z85FIld+W4lEvGLRvj2pXVWui9l+xr8aWk4Y2UMkIdeZMIAwsUI+uLMcRFWae7U0IsdrjvCbPeIrTWq4534ZH+4hgkjYk9512hLuA0jLaQcDN16c9wMaKr845d6T545P8zfvfjavicO+INBLWWIU7HwsAw299C9QWyWwbJw5CSOnWa2RTKRG75+b3SRSyNmacTW2h9PPPf7w0r93KXzW5lx0XDkqNMCICTHR9ZPz4MhaQVPJqZqktjdFfrez9tH8pQw6jjeu2rFTc3y6f4MfLIb0obhZNhgXoujP4nDJ1kkwRmRX9N6fau/+ZT79ItvjfSpZRidy3Jsa+e+g8f7fCuWLq6VopZlxp26tBsKyYnhxjpFcIkf759qOUxntV95+L2+yJBPzBoUlmUcvcC2tE3imZP9GdQHSLlixMkHLIslnL2Io6eZYUEiClQ37+xf/pV/e+/YuydGejkeRh+3njp99qW3umdcv2JOM3P0vrQTiNl1Gjf88uBPLhgcDOcS9Zf0kN+n/vOr9ut7j4+iJn19EV2etm6+m0kldIs1hYfxT8nywQCHaeHoaZy5yEmQwsFqb/zZ/inff2RvMj6SbE4pxtR5TSbiz+84bIfmLF8wVTZ7TIeiVp0jpLCS5nxY3iNu+Dr76zXJab9Q/71fHBLuKL3fkc7emfOWzavp6U/ZnKE2dKWVj7k1WdF+HOpk0QTjRH6fv0dr+8avjedebSd3TJ3XsaZaSDhvdRw90MWXLl3WpMYsI5mwwgk7EFJ0VboCR47g70ZqLUeYvP6rj1y41Dey5l9aD/dAp75+9Y1V7tlomlX74fddllkJRDjTjSNnmGlBAgVqWndEl3714WMnOk+OvhqF4iuB890XXth7rmX2iuunqK7ek3HkSCascCekmkN6Z4bTsWBvSgoElH/dob2yp3OMdcjo6dPx6s3L6p1UbyLDmqsgDXVxHIaNd07iTA8jQSpnVLfox+0t//iLPelkZcLwig26ZPT0SzuP9MszVy6aqVldluVEjYDh8CrNlAYKAkNMlzojiipnDvRO/u5jJ12nAhNMzl/oleuuXzU1nUzoloOmmsG+xHEphoOdLJZgnCjgD5z3tf3Nr1Mv7dhPojIDRajwyCuJw0dP7OmkhUtWTQpGLD2SsNRYRgkqtk8pinsYbAdHLjLbMS25+euPGT2XRu8cynD4RN/Cm5ZNVbqiCfKpqCoWWQZBONHFjp1llg0Z5K+d/Fp0ydf+/cjp06crVQEPlZ9+0dvb+7td56qmrVw0Q6X0qYzt9qXBmQj7Csv4Tvay3hQF/P5/293y0q5KTot0Xftwl7tx1Vw10xVNsoYqaJq3bAO6gYOd7HwfANIkJuoX/6i98YeP7zbSiSsWO1KMy2Qh28rs2HOsy565csnsoHPaMs1omqUtVPkgK+hLoLOXaRIO9c9+6JdnnUo0/2Ik4vE+0brhBl8mEUtnWEs9uISLEXScYHEdEigYCp1V277+ZPy1nW+P07+FG7+JmPRe55nfH8W8m9ZPr07YeiJlskiKSRyne5ltk6O2fuMJ58LFykx7KcPJsxfrpy++qSHSnzCFYLEEjp5ljoDCyF8/7YWLi/7m3w+eO3duPE7tYXynDff3x17YdU5qWr1kTg1Lnzcs9CWY7SDg9/3f/a0v7By/WdHU0RlbvWJJI85GkoimGAP5ZG7XLf2nndU//tVu0xjHya24CpPcXcfae+D48cSU5cuWVotuy7RUiR1NXvfQ4+ccp8Izn4phW8a7vcqWldOYfoERgqGqTrnta4/3vrn3ICqUdL8MrsZKFwBnz51/9VBm+oL1cxuMjKt+8zfifE/Fxr6GQl8kmvHNXD9HSP7a57pv/NvtHd3dw82N/SGBy75P/cmW//rA6qv1xAwwSf2fn77z3ttXXBP/FGiccTXW2L1/p5vABCYwgQlMYAL/2fH/AdkCEQl+/Ar/AAAAAElFTkSuQmCCCg==',
         //              icon4: 'jqtouch4.png',
         //                      startupScreen: null,                                            //Pass a string path to a 320px x 460px startup screen for full screen apps.
                                 statusBar: 'black-translucent',                                 //Styles the status bar when running as a fullscreen app. Other options are `default`, `black`, and `black-translucent`.
         //                      addGlossToIcon: true,                                           //Set to 'false' to prevent automatic glossy button effect on icon.
                                 preloadImages: false,                                           //Pass an array of image paths to load them before page loads. Ex: `['images/link_over.png', 'images/link_select.png']`
                                 fixedViewport: true,                                            //Removes the user's ability to scale the page. Ensures the site behaves more like an application.
         //                      fullScreen: true,                                                       //The website will become a fullscreen application when saved to a user's home screen. Set to `false` to disable.
         //                      fullScreenClass: 'fullscreen'                           //Adds a class to the `<body>` when running in full-screen mode, to allow for easy detection and styling. Set to `false` to disable.
         //                      themeSelectionSelector: '#jqt #themes ul',      //???
 
         //                      useAnimations: true,                                            //Set to `false` to disable all animations.
         //                      useFastTouch: true,                                                     //Removes ~350ms onClick delay when tapping a link (use in conjunction with the .tap() event)  **Experimental**
         //                      useTouchScroll: true,                                           //Adds support for iOS5 scrolling. Set to false to disable. **Experimental**
 
                                 cacheGetRequests: false,                                                //Automatically caches GET requests, so subsequent taps reference the pre-loaded views. (default: true)
 
         //                      backSelector: '.back, .cancel, .goback',        //A CSS selector for back links/buttons. When clicked, the page history goes back one, automatically reversing whichever entrance animation was used.
 
         //                      cubeSelector: '.cube',                                          //Link selector for a cube animation.
         //                      dissolveSelector: '.dissolve',                          //Link selector for a dissolve animation.
         //                      fadeSelector: '.fade',                                          //Link selector for a fade animation.
         //                      flipSelector: '.flip',                                          //Link selector for a 3d flip animation.
                                 formSelector: null,                                                     //Sets which forms are automatically submitted via Ajax. (default: 'form')
         //                      popSelector: '.pop',                                            //Link selector for a pop animation. (default: '.pop')
         //                      slideSelector: 'body > * > ul li a',            //Link selector for the default slide-left transition. By default applies to all links within an unordered list. Accepts any jQuery-capable selector `'li &gt; a, a:not(.dontslide)'`, etc. (default: 'body > * > ul li a')
         //                      slideupSelector: '.slideup',                            //Link selector for a slide up animation. (default: '.slideup')
         //                      submitSelector: '.submit',                                      //Selector which, when clicked, will submit its parent form (and close keyboard if open). (default: '.submit')
         //                      swapSelector: '.swap',                                          //Link selector for 3d swap animation. (default: '.swap')
         //                      touchSelector: 'a, .touch',                                     //Selector for items which are automatically given expanded touch events. This makes ordinary links more responsive and provides trigger events like `swipe` (default: 'a, .touch')
 
                         debug: false
                 });
 
                 this.setJQTouch(jqt);
         },
-
+*/
         //=========================================================================
 
         'showAddToHomeScreenBaloon': function () {
-console.log(">>> showAddToHomeScreenBaloon");
         },
 
         //-------------------------------------------------------------------------
 
         'selectInitialProxy': function () {
-//console.log(">>> selectInitialProxy");
                 if (this.isOnline()) {
-//console.log("--- selectInitialProxy: using default proxy");
                         this._proxy = Clipperz.PM.Proxy.defaultProxy;
                 } else {
                         if (this.hasLocalData()) {
-//console.log("--- selectInitialProxy: using local cache proxy");
                                 this._proxy = new Clipperz.PM.Proxy.OfflineCache({'shouldPayTolls':false});
                         } else {
                                 this.showOfflineError();
                         }
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'showLoginForm': function (args) {
                 args = args || {};
 
                 args['callback'] = MochiKit.Base.method(this, 'doLogin');
 
                 if (Clipperz.PM.PIN.isSet()) {
                         args['errorCallback'] = MochiKit.Base.method(this, 'handleFailedPinLogin');
                         this.loginForm().showPinLogin(args);
                 } else {
                         args['errorCallback'] = MochiKit.Base.method(this, 'handleFailedCredentialsLogin');
                         this.loginForm().showCredentialsLogin(args);
                 }
         },
 
         //.........................................................................
 
         'handleFailedCredentialsLogin': function () {
-console.log("LOGIN FAILED");
                 this.showLoginForm({'previousFailedAttempt':'LOGIN'});
         },
 
         //.........................................................................
 
         'handleFailedPinLogin': function () {
                         varfailedAttempts;
                         varstatus;
 
                 failedAttempts = Clipperz.PM.PIN.recordFailedAttempt();
                 this.showLoginForm({'previousFailedAttempt':'PIN', 'failedAttempts': failedAttempts});
         },
 
         //-------------------------------------------------------------------------
 
         'doLogin': function (someArgs) {
                 var deferredResult;
                 var credentials;
                 var errorCallback;
                 var user;
                 var getPassphraseDelegate;
 
-//console.log(">>> MainController.doLogin", someArgs);
                 credentials = someArgs['credentials'];
                 errorCallback = someArgs['errorCallback'] || MochiKit.Base.noop;
 
                 getPassphraseDelegate = MochiKit.Base.partial(MochiKit.Async.succeed, credentials.passphrase);
                 user = new Clipperz.PM.DataModel.User({'username':credentials.username, 'getPassphraseFunction':getPassphraseDelegate});
 
                 deferredResult = new Clipperz.Async.Deferred('MainController.doLogin', {trace:false});
                 deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'initProgress', {'steps':4});
                 deferredResult.addCallback(MochiKit.Async.wait, 0.1);
                 deferredResult.addMethod(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'deferredEntropyCollection');
                 deferredResult.addMethod(user, 'login');
                 deferredResult.addCallbacks(
                         MochiKit.Base.method(this, 'processSuccessfulLogin', user),
                         errorCallback
                 );
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //..........................................................................
 
         'processSuccessfulLogin': function (aUser) {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred('MainController.processSuccessfulLogin', {trace:false});
                 deferredResult.addMethod(Clipperz.PM.PIN, 'resetFailedAttemptCount');
         //      deferredResult.addMethod(this, 'removeLoginForm');
                 deferredResult.addMethod(this, 'setUser', aUser);
                 deferredResult.addMethod(this, 'setupApplication');
                 deferredResult.addMethod(this, 'runApplication');
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'setupApplication': function () {
                         vardeferredResult;
 
-console.log(">>> setupApplication");
                 deferredResult = new Clipperz.Async.Deferred("MainController.setupApplication", {trace:false});
                 deferredResult.addMethod(this, 'welcomeFirstTimeUser');
                 deferredResult.addMethod(this, 'showPaymentReminder');
                 deferredResult.addMethod(this, 'copyDataLocally');
                 deferredResult.callback(arguments);
 
                 return deferredResult;
         },
 
 
         //..........................................................................
 
         'isFirstTimeUser': function () {
                 return false;
         },
 
         'welcomeFirstTimeUser': function () {
                         vardeferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred('MainController.welcomeFirstTimeUser', {trace:false});
 
                 if (this.isFirstTimeUser()) {
-                        deferredResult.addCallback(function () { console.log("--> welcome"); });
+                        deferredResult.addCallback(function () { Clipperz.log("--> welcome"); });
                 }
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //..........................................................................
 
         'shouldShowPaymentReminder': function () {
                 return true;
         },
 
         'showPaymentReminder': function () {
                         vardeferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred('MainController.showPaymentReminder', {trace:false});
 
                 if (this.shouldShowPaymentReminder()) {
-                        deferredResult.addCallback(function () { console.log("--> payment reminder"); });
+                        deferredResult.addCallback(function () { Clipperz.log("--> payment reminder"); });
                 }
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //..........................................................................
 
         'canCopyDataLocally': function () {
                 return false;
         },
 
         'copyDataLocally': function () {
                         vardeferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred('MainController.copyDataLocally', {trace:false});
 
                 if (this.canCopyDataLocally()) {
-                        deferredResult.addCallback(function () { console.log("--> copy data locally"); });
+                        deferredResult.addCallback(function () { Clipperz.log("--> copy data locally"); });
                 }
                 deferredResult.callback();
 
                 return deferredResult;
 
         },
 
         //-------------------------------------------------------------------------
 
         'runApplication': function () {
                 var deferredResult;
 
-//console.log(">>> runApplication");
                 deferredResult = new Clipperz.Async.Deferred('MainController.runApplication', {trace:true});
                 deferredResult.addMethod(this.user(), 'getRecords');
                 deferredResult.addMethod(this, 'showCards');
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'showOfflineError': function (anException) {
                 alert("Error: " + anException);
                 throw anException;
         },
 
         //=========================================================================
 
         'isOnline': function() {
                 return navigator.onLine;
         },
 
         'hasLocalData': function() {
                 return false;
         },
         
         //=========================================================================
 
         'loginForm': function() {
                 if (this._loginForm == null) {
                         this._loginForm = new Clipperz.PM.UI.Mobile.Components.LoginForm({element:MochiKit.DOM.getElement('loginForm')});
                 }
                 
                 return this._loginForm;
         },
 
         'removeLoginForm': function () {
                 if (this._loginForm != null) {
                         this._loginForm.remove();
                         this._loginForm = null;
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'cardList': function () {
                 if (this._cardList == null) {
                         this._cardList = new Clipperz.PM.UI.Mobile.Components.CardList({element:MochiKit.DOM.getElement('cardList')});
                         MochiKit.Signal.connect(this._cardList, 'selectedCard', this, 'selectCardHandler');
                 }
 
                 return this._cardList;
         },
 
         'showCards': function (someCards) {
                 this.cardList().showCards(someCards);
-                this.jQTouch().goTo('#cardList', 'slideleft');
+        //      this.jQTouch().goTo('#cardList', 'slideleft');
         },
 
         //-------------------------------------------------------------------------
 
         'cardDetail': function () {
                 if (this._cardDetail == null) {
                         this._cardDetail = new Clipperz.PM.UI.Mobile.Components.CardDetail({element:MochiKit.DOM.getElement('cardDetail')});
                 }
 
                 return this._cardDetail;
         },
 
         'selectCardHandler': function (aCardReference) {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("MainController.selectCardHandler", {trace:true});
                 deferredResult.addMethod(this.cardDetail(), 'render');
-                deferredResult.addMethod(this.jQTouch(), 'goTo', '#cardDetail', 'slideleft');
+        //      deferredResult.addMethod(this.jQTouch(), 'goTo', '#cardDetail', 'slideleft');
                 deferredResult.addMethod(this.user(), 'getRecord', aCardReference);
                 deferredResult.addMethod(this.cardDetail(), 'showCard');
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js
index d6b0574..82c8dfd 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AccountPanel.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.AccountPanel = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.AccountPanel.superclass.constructor.apply(this, arguments);
 
         //this._initiallySelectedTab = args.selected || 'ACCOUNT';
         this._initiallySelectedTab = args.selected || 'PASSPHRASE';
         this._tabPanelControllerConfiguration = {
         //      'ACCOUNT': {
         //                      tab:'accountTab',
         //                      panel:'accountPanel'
         //      },
                 'PASSPHRASE': {
                                 tab:'passphraseTab',
                                 panel:'passphrasePanel'
                 },
                 'OTP': {
                                 tab:'OTPTab',
                                 panel:'OTPPanel'
                 },
                 'PREFERENCES': {
                                 tab:'preferencesTab',
                                 panel:'preferencesPanel'
                 },
                 'LOGIN_HISTORY': {
                                 tab:'loginHistoryTab',
                                 panel:'loginHistoryPanel'
                 }
         };
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.AccountPanel, Clipperz.PM.UI.Common.Components.TabPanelComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.AccountPanel component";
         },
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AppPage.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AppPage.js
index 3b3c8b4..da5fd76 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AppPage.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/AppPage.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.AppPage = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.AppPage.superclass.constructor.call(this, args);
 
         this._element = args.element || null;
 
         this._slots = {
                 'cardGrid' : this.getId('cardGrid'),
         //      'directLoginGrid' : this.getId('directLoginGrid'),
                 'accountPanel': this.getId('accountPanel'),
                 'dataPanel': this.getId('dataPanel'),
                 'toolsPanel': this.getId('toolsPanel'),
                 'userInfoBox': this.getId('userInfoBox'),
                 'tabSidePanel': this.getId('tabSidePanel')
         };
                 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.AppPage, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.AppPage component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                         this.append(this.element(),                     {tag:'div', id:this.getId('userInfoBox'), cls:'userInfoBox'});
                         this.append(this.element(),                     {tag:'div', id:this.getId('sidePanels'), cls:'sidePanels'});
                         this.append(this.getId('sidePanels'),{tag:'div', id:this.getId('tabSidePanel'), cls:'tabSidePanel', children:[]});
 
                 this.append(this.element(), {tag:'div', id:this.getId('mainPanels'), cls:'mainPanels'});
                 this.append(this.getId('mainPanels'), {tag:'div', id:this.getId('cardGrid'), cls:'gridComponent cardGrid'});
         //              this.append(this.getId('mainPanels'), {tag:'div', id:this.getId('directLoginGrid'), cls:'gridComponent directLoginGrid'});      
                         this.append(this.getId('mainPanels'), {tag:'div', id:this.getId('accountPanel'), cls:'otherPanel'});    
                         this.append(this.getId('mainPanels'), {tag:'div', id:this.getId('dataPanel'), cls:'otherPanel'});       
                         this.append(this.getId('mainPanels'), {tag:'div', id:this.getId('toolsPanel'), cls:'otherPanel'});      
         },
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/BookmarkletComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/BookmarkletComponent.js
index 1835ca9..4cfca32 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/BookmarkletComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/BookmarkletComponent.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.BookmarkletComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.BookmarkletComponent.superclass.constructor.apply(this, arguments);
         MochiKit.Signal.connect(Clipperz.PM.Strings.Languages, 'switchLanguage', this, 'updateBookmarkletURLs');
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.BookmarkletComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.BookmarkletComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
         //      var bookmarkletUrl;
 //
         //      if (Clipperz_IEisBroken == true) {
         //              bookmarkletUrl = bookmarklet_ie;
         //      } else {
         ///             bookmarkletUrl = bookmarklet;
         //              bookmarkletUrl = Clipperz.PM.Strings['bookmarklet'];
         //      }
 
                 this.append(this.element(), {tag:'div', cls:'bookmarklet', children: [
                         {tag:'div', id:this.getId('linkBlock'), cls:'bookmarklet_link', children:[
         //                      {tag:'a', id:this.getId('link'), href:bookmarkletUrl, children:[
                                 {tag:'a', id:this.getId('link'), href:'#', children:[
                                         {tag:'div', cls:'icon'},
                                         {tag:'div', cls:'text', children:[
                                                 {tag:'span', html:"add to Clipperz"}
                                         ]}
                                 ]}
                         ]}
                 ]});
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogComponent.js
index af33d85..8bb64f5 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogComponent.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.CardDialogComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.CardDialogComponent.superclass.constructor.apply(this, arguments);
 
         this._tabPanelController = null;
 
         this._tabPanelControllerConfiguration = {
                 'DETAILS': {
                                 tab:'detailTab',
                                 panel:'detailTabpanel'
                 },
                 'DIRECT_LOGINS': {
                                 tab:'directLoginTab',
                                 panel:'directLoginTabpanel'
                 },
                 'SHARING': {
                                 tab:'sharingTab',
                                 panel:'sharingTabpanel'
                 }
         };
         
         this._tooltips = null;
 
         this._isSavingEnabled = false;
                 this._hintMode = 'OFF';         //'ON'
 
         this._fieldComponents = {};
         this._directLoginComponents = {};
 
                 this._displayMode = 'fixed';    //'scrollable';
         
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CardDialogComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.CardDialogComponent component";
@@ -637,214 +635,210 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CardDialogComponent, Clipperz
 
         //      height = MochiKit.Style.getElementDimensions(this.displayElement())['h'];
                 y = MochiKit.Style.getElementPosition(this.displayElement())['y'];
 
                 footerElement = MochiKit.Selector.findChildElements(this.displayElement(), ['div.footer'])[0];
                 footerElementPosition = MochiKit.Style.getElementPosition(footerElement);
                 footerElementDimensions = MochiKit.Style.getElementDimensions(footerElement);
                 footerComputedHeight = footerElementPosition['y'] + footerElementDimensions['h'] - y;
 
         //      scrollHeight = this.displayElement().scrollHeight;
                 scrollHeight = footerComputedHeight;
 
                 viewportHeight = MochiKit.Style.getViewportDimensions()['h'];
                 viewportY = MochiKit.Style.getViewportPosition()['y'];
 
                 if ((y + scrollHeight) > (viewportY + viewportHeight)) {
                         this.setDisplayMode('scrollable');
                         MochiKit.DOM.addElementClass(this.element(), 'scrollable');
                         MochiKit.DOM.removeElementClass(this.element(), 'fixed');
                         MochiKit.Style.setElementPosition(this.displayElement(), {y:Math.max(0, Math.min(y, (viewportY + viewportHeight) - scrollHeight))}, 'px');
                         MochiKit.Visual.ScrollTo(this.displayElement(), {duration:0.5});
                 } else {
                         this.setDisplayMode('fixed');
                         MochiKit.DOM.removeElementClass(this.element(), 'scrollable');
                         MochiKit.DOM.addElementClass(this.element(), 'fixed');
                 }
         },
 
         //=========================================================================
 
         'unselectCurrentSelectedItems': function () {
                 MochiKit.Iter.forEach(MochiKit.Selector.findChildElements(this.displayElement(), ['.selectedField']), function (anElement) {
                         MochiKit.DOM.removeElementClass(anElement, 'selectedField');
                 });
         },
 
         //=========================================================================
 
         'hideProgressMask': function () {
                 MochiKit.DOM.removeElementClass(this.getId('panel'), 'loading');
         },
 
         'showProgressMask': function () {
                 this.getElement('progressDescription').innerHTML = "Saving";
                 MochiKit.DOM.addElementClass(this.getId('panel'), 'loading');
         },
 
         'showError': function (anError) {
-//console.log(">>> showError", anError);
                 MochiKit.Style.hideElement(this.getId('progress'));
                 this.getElement('errorMessage').innerHTML = Clipperz.PM.Strings.errorDescriptionForException(anError['message']);
                 MochiKit.Style.showElement(this.getId('error'));
         },
 
         //-------------------------------------------------------------------------
 
         'cancel': function () {
 /*
                 var deferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("CardDialogComponent.cancel", {trace:false});
                 deferredResult.addCallback(MochiKit.Base.method(this, 'isSavingEnabled'));
                 deferredResult.addIf([
                         MochiKit.Base.method(this, 'askConfirmationForLoosingPendingChanges')
                 ], []);
                 deferredResult.addCallback(MochiKit.Base.partial(MochiKit.Signal.signal, this, 'cancel'));
                 deferredResult.callback();
                 
                 return deferredResult;
 */
                 MochiKit.Signal.signal(this, 'cancel');
         },
 
         'handleCancelEvent': function (anEvent) {
                 anEvent.preventDefault();
                 this.cancel();
         },
         
         //-------------------------------------------------------------------------
 
         'handleSaveEvent': function (anEvent) {
                 anEvent.preventDefault();
                 
                 if (! MochiKit.DOM.hasElementClass(anEvent.src(), 'disabled')) {
                         MochiKit.Signal.signal(this, 'save');
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'handleAddDirectLogin': function (anEvent) {
                 anEvent.preventDefault();
                 
                 MochiKit.Signal.signal(this, 'addDirectLogin');
         },
 
         //-------------------------------------------------------------------------
 
         'handleOnFocusEvent': function (anElement, anEvent) {
                 this.unselectCurrentSelectedItems();
                 MochiKit.DOM.addElementClass(anElement, 'selectedField');
         },
 
         'handleLooseFocusEvent': function (anElement, anEvent) {
                 this.unselectCurrentSelectedItems();
         },
 
         //-------------------------------------------------------------------------
 
         'handleTabSelected': function (aSelectedTab) {
                 this.unselectCurrentSelectedItems();
 
                 switch (aSelectedTab) {
                         case 'DETAILS':
         //                      MochiKit.Style.hideElement(this.getElement('addDirectLoginButton'));
                                 break;
                         case 'DIRECT_LOGINS':
         //                      MochiKit.Style.showElement(this.getElement('addDirectLoginButton'));
                                 break;
                         case 'SHARING':
         //                      MochiKit.Style.hideElement(this.getElement('addDirectLoginButton'));
                                 break;
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'handleKeyEvent': function (anEvent) {
-//console.log("####", anEvent.key().string);
                 if (anEvent.key().string == 'KEY_ESCAPE') {
                         MochiKit.Signal.signal(this, 'changedValue');
                         this.cancel();
                 } else if (anEvent.key().string == 'KEY_ENTER') {
                         if (anEvent.target().nodeName == 'TEXTAREA') {
                                 
                         } else {
                                 anEvent.preventDefault();
                         }
                 }
         },
 
         //=========================================================================
 
         'askConfirmationForLoosingPendingChanges': function () {
                 var deferredResult;
                 var confirmationDialog;
                 
                 confirmationDialog = new Clipperz.PM.UI.Common.Components.SimpleMessagePanel({
                                 title:"Alert",
                                 text:"Should lost pending changes?",
                                 type:'ALERT',
                         buttons: [
                                         {text:"Cancel",result:'CANCEL', isDefault:true},
                                 {text:"Ok", result:'OK'}
                         ]
                 });
 
                 deferredResult = new Clipperz.Async.Deferred("CardDialogComponent.askConfirmationForLoosingPendingChanges", {trace:false});
         //      deferredResult = confirmationDialog.deferredShow({openFromElement:anEvent.src(), onOkCloseToElement:MochiKit.DOM.currentDocument().body, onCancelCloseToElement:anEvent.src()});
                 deferredResult.addMethod(confirmationDialog, 'deferredShow', {
                                 'openFromElement':              this.getElement('cancelButton'),
                                 'onOkCloseToElement':           null,   //this.getElement('cancelButton'),
                                 'onCancelCloseToElement':this.getElement('cancelButton')
                 });
-        //      deferredResult.addCallback(function () { console.log("DELETE: " + anObject.toString(), anObject); });
-        //      deferredResult.addErrbackPass(function () { console.log("skip deletion: " + anObject.toString(), anObject); });
                 deferredResult.callback();
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'showDirectLoginEditingComponent': function () {
                         varwidth;
                 var transition;
                 var duration;
                 
                         width = MochiKit.Style.getElementDimensions(this.getElement('directLoginsComponentContainer'))['w'];
                 transition = MochiKit.Visual.Transitions.sinoidal;
                 duration = 1;
 
                 return Clipperz.Async.callbacks("CardDialogComponent.showDirectLoginEditingComponent", [
                         MochiKit.Base.method(this, 'disableCardTitleEditing'),
                         MochiKit.Base.method(this.tabPanelController(), 'disable'),
 
                         MochiKit.Base.bind(function () {
                                 MochiKit.Style.setElementPosition  (this.getElement('directLoginEditDetail'), {x:width, y:-MochiKit.Style.getElementDimensions(this.getElement('directLogins'))['h']});
                                 MochiKit.Style.setElementDimensions(this.getElement('directLoginEditDetail'), {w:width});
                                 MochiKit.Style.showElement(this.getElement('directLoginEditDetail'));
                                 MochiKit.Style.setOpacity(this.getElement('directLoginEditDetail'), 0);
                                 MochiKit.Style.setElementDimensions(this.getElement('directLoginsComponentContainer'), {
                                         h:Math.max(
                                                 MochiKit.Style.getElementDimensions(this.getElement('directLogins'))['h'],
                                                 MochiKit.Style.getElementDimensions(this.getElement('directLoginEditDetail'))['h']
                                         )
                                 });
         //                      MochiKit.Style.setElementDimensions(this.getElement('directLoginsComponentContainer'), {h:MochiKit.Style.getElementDimensions(this.getElement('directLogins'))['h']});
                         }, this),
                                 MochiKit.Base.partial(Clipperz.Visual.deferredAnimations,MochiKit.Visual.Parallel, [
                                         new MochiKit.Visual.Move(this.getElement('directLogins'),                       {x:-width, y:0, mode:'relative', transition:transition, sync:true}),
                                         new MochiKit.Visual.Opacity(this.getElement('directLogins'),            {from:1.0, to:0.0, transition:transition, sync:true}),
                                         new MochiKit.Visual.Move(this.getElement('directLoginEditDetail'),      {x:-width, y:0, mode:'relative', transition:transition, sync:true}),
                                         new MochiKit.Visual.Opacity(this.getElement('directLoginEditDetail'),{from:0.0, to:1.0, transition:transition, sync:true})
                         ], {duration:duration}),
 
                         MochiKit.Base.noop
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'hideDirectLoginEditingComponent': function () {
                         varwidth;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js
index 2e61f5f..0cee650 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js
@@ -1,179 +1,173 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.CardDialogRecordDirectLoginComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.CardDialogRecordDirectLoginComponent.superclass.constructor.apply(this, arguments);
 
                 this._reference = args.reference|| Clipperz.Base.exception.raise('MandatoryParameter');
         this._faviconComponent = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CardDialogRecordDirectLoginComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.CardDialogRecordDirectLoginComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'reference': function () {
                 return this._reference;
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
-//console.log(">>> CardDialogRecordDirectLoginComponent.renderSelf");
                 this.append(this.element(), [
                         {tag:'div', cls:'cardDialogRecordDirectLoginComponent_favicon', children:[
                                 {tag:'img', cls:'favicon', id:this.getId('favicon')}
                         ]},
                         {tag:'div', cls:'cardDialogRecordDirectLoginComponent_label', children:[
                                 {tag:'input', id:this.getId('label'), type:'text'}
                         ]},
                         {tag:'div', cls:'open', children:[
                                 {tag:'span', children:[
                                         {tag:'a', href:'open', id:this.getId('open'), html:'&nbsp;'}
                                 ]}
                         ]},
                         {tag:'div', cls:'edit', children:[
                                 {tag:'span', children:[
                                         {tag:'a', href:'edit', id:this.getId('edit'), html:"edit"}
                                 ]}
                         ]},
                         {tag:'div', cls:'delete', children:[
                                 {tag:'span', children:[
                                         {tag:'a', href:'delete', id:this.getId('delete'), html:"delete"}
                                 ]}
                         ]}
 /*
                         {tag:'td', cls:'fieldState'},
                         {tag:'td', cls:'fieldLabel', children:[
                                 {tag:'input', cls:'label', id:this.getId('label')}
                         ]},
                         {tag:'td', cls:'fieldLock', children:[
                                 {tag:'div', cls:'unlocked', id:this.getId('isHidden')}
                         ]},
                         {tag:'td', cls:'fieldValue', children:[
                                 {tag:'div', cls:'unlocked', id:this.getId('valueWrapper'), children:[
                                         {tag:'input', type:'text', cls:'value', id:this.getId('value')}
                                 ]}
                         ]},
                         {tag:'td', cls:'fieldAddDelete', children:[
                                 {tag:'div', cls:'delete', children:[
                                         {tag:'span', children:[
                                                 {tag:'a', href:'#', id:this.getId('delete'), html:"delete"}
                                         ]}
                                 ]}
                         ]}
 */
                 ]);
 
                         MochiKit.Signal.connect(this.getId('label'),    'onkeyup',MochiKit.Base.partial(MochiKit.Signal.signal, this, 'changedValue'));
                         MochiKit.Signal.connect(this.getId('open'),             'onclick',this, 'openDirectLogin');
                         MochiKit.Signal.connect(this.getId('edit'),             'onclick',this, 'editDirectLogin');
                         MochiKit.Signal.connect(this.getId('delete'),   'onclick',this, 'deleteDirectLogin');
         },
 
         //-------------------------------------------------------------------------
 
         'shouldShowElementWhileRendering': function () {
                 return false;
         },
 
         //-------------------------------------------------------------------------
         
         'faviconComponent': function () {
                 if (this._faviconComponent == null) {
-//console.log("created the FAVICON component");
                         this._faviconComponent = new Clipperz.PM.UI.Common.Components.FaviconComponent({element:this.getId('favicon')});
                 }
                 
                 return this._faviconComponent;
         },
 
         //=========================================================================
 
         'label': function () {
                 return this.getElement('label').value;
         },
 
         'setLabel': function (aValue) {
                 this.getElement('label').value = Clipperz.Base.sanitizeString(aValue);
         },
 
         //-------------------------------------------------------------------------
 
         'favicon': function () {
         //      return this.getElement('favicon').src;
                 return this.faviconComponent().src();
         },
 
         'setFavicon': function (aValue) {
         //      this.getElement('favicon').src = Clipperz.Base.sanitizeString(aValue);
                 this.faviconComponent().setSrc(Clipperz.Base.sanitizeString(aValue));
         },
 
         //=========================================================================
 
         'openDirectLogin': function (anEvent) {
                 anEvent.preventDefault();
                 
                 MochiKit.Signal.signal(this, 'openDirectLogin', this.reference());
         },
 
         //-------------------------------------------------------------------------
 
         'editDirectLogin': function (anEvent) {
                 anEvent.preventDefault();
                 
                 MochiKit.Signal.signal(this, 'editDirectLogin', this.reference());
-//console.log("EDIT DIRECT LOGIN");
         },
 
         //-------------------------------------------------------------------------
 
         'deleteDirectLogin': function (anEvent) {
                 anEvent.preventDefault();
                 
                 MochiKit.Signal.signal(this, 'deleteDirectLogin', this.reference());
-//console.log("DELETE DIRECT LOGIN");
         },
 
 
 
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js
index b58062c..689406a 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.CardDialogRecordFieldComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.CardDialogRecordFieldComponent.superclass.constructor.apply(this, arguments);
 
                 this._reference = args.reference|| Clipperz.Base.exception.raise('MandatoryParameter');
         this._actionType = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CardDialogRecordFieldComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.CardDialogRecordFieldComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
                 this.append(this.element(), [
                         {tag:'td', cls:'fieldState'},
                         {tag:'td', cls:'fieldLabel', children:[
                                 {tag:'input', cls:'label', id:this.getId('label')}
                         ]},
                         {tag:'td', cls:'fieldLock', children:[
                                 {tag:'div', cls:'unlocked', id:this.getId('isHidden')}
                         ]},
                         {tag:'td', cls:'fieldValue', children:[
                                 {tag:'div', cls:'unlocked', id:this.getId('valueWrapper'), children:[
                                         {tag:'input', type:'text', cls:'value', id:this.getId('value')}
                                 ]}
                         ]},
                         {tag:'td', cls:'fieldAction', children:[
                                 {tag:'a', href:'#', id:this.getId('actionLink'), html:'&nbsp;'}
                         ]},
                         {tag:'td', cls:'fieldAddDelete', children:[
                                 {tag:'div', cls:'delete', children:[
                                         {tag:'span', children:[
@@ -124,64 +122,62 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CardDialogRecordFieldComponen
 
         'setActionType': function (anActionType) {
                 this._actionType = anActionType;
                 
                 switch (this._actionType) {
                         case 'NONE':
                                 MochiKit.Style.hideElement(this.getId('actionLink'));
                                 MochiKit.DOM.setElementClass(this.getId('actionLink'), '');
                                 break;
                         case 'URL':
                                 MochiKit.Style.showElement(this.getId('actionLink'));
                                 MochiKit.DOM.setElementClass(this.getId('actionLink'), 'url');
                                 break;
                         case 'EMAIL':
                                 MochiKit.Style.showElement(this.getId('actionLink'));
                                 MochiKit.DOM.setElementClass(this.getId('actionLink'), 'email');
                                 break;
                         case 'PASSWORD':
                                 MochiKit.Style.showElement(this.getId('actionLink'));
                                 MochiKit.DOM.setElementClass(this.getId('actionLink'), 'password');
                                 break;
                 }
         },
 
         //=========================================================================
 
         'isHidden': function () {
         //      return this.getElement('value').value;
                 return MochiKit.DOM.hasElementClass(this.getElement('isHidden'), 'locked');
         },
 
         'setIsHidden': function (aValue) {
         //      this.getElement('value').value = Clipperz.Base.sanitizeString(aValue);
                 MochiKit.DOM.setElementClass(this.getElement('isHidden'), (aValue ? 'locked': 'unlocked'));
                 MochiKit.DOM.setElementClass(this.getElement('valueWrapper'), (aValue ? 'locked': 'unlocked'));
         },
 
         'toggleIsHidden': function (anEvent) {
                 anEvent.preventDefault();
                 
                 this.setIsHidden(! this.isHidden());
                 MochiKit.Signal.signal(this, 'changedValue');
         },
 
         //=========================================================================
 
         'handleActionLink': function (anEvent) {
                 anEvent.preventDefault();
-
-//console.log("ACTION LINK - " + this.actionType());
                 MochiKit.Signal.signal(this, 'performAction', this.reference(), anEvent.target());
         },
 
         //=========================================================================
 
         'deleteField': function (anEvent) {
                 anEvent.preventDefault();
                 
                 MochiKit.Signal.signal(this, 'deleteField', this.reference());
         },
 
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ColumnManager.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ColumnManager.js
index 391c379..41e32a0 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ColumnManager.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ColumnManager.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 //#############################################################################
 
 Clipperz.PM.UI.Web.Components.ColumnManager = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.ColumnManager.superclass.constructor.call(this, args);
 
                 this._name               = args.name    || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._selector   = args.selector|| Clipperz.Base.exception.raise('MandatoryParameter');;
                 this._label              = args.label   || null;
                 this._isSortable = args.sortable|| false;
                 this._comparator = args.comparator|| null;
                 this._sorted     = args.sorted          || 'UNSORTED';  //'ASCENDING' | 'DESCENDING' | 'UNSORTED'
                 this._cssClass   = args.cssClass|| '';
 
         this._signalIdentifiers = [];
         
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.ColumnManager, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.ColumnManager - " + this._name;
         },
         
         'name': function () {
                 return this._name;
         },
 
         'label': function () {
                 return this._label;
         },
         
         'selector': function () {
                 return this._selector;
         },
         
         'comparator': function() {
                 return this._comparator;
         },
         
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js
index d3aa175..3d0ba76 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js
@@ -1,68 +1,66 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.CreateNewCardSplashComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.CreateNewCardSplashComponent.superclass.constructor.apply(this, arguments);
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CreateNewCardSplashComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.CreateNewCardSplashComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
                 this.append(this.element(), [
                         {tag:'div', cls:'createNewCardSplash', id:this.getId('button'), children:[
                                 {tag:'span', html:"Create New Card"}
                         ]}
                 ]);
                 
                 MochiKit.Signal.connect(this.getElement('button'), 'onclick', this, 'handleClick');
         },
 
         //-------------------------------------------------------------------------
 
         'handleClick': function (anEvent) {
                 anEvent.preventDefault();
                 MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'addCard', this.element());
         },
 
         //-------------------------------------------------------------------------
 
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DataPanel.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DataPanel.js
index 462d864..23f6710 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DataPanel.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DataPanel.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.DataPanel = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.DataPanel.superclass.constructor.apply(this, arguments);
 
         this._initiallySelectedTab = args.selected || 'OFFLINE_COPY';
         this._tabPanelControllerConfiguration = {
                 'OFFLINE_COPY': {
                                 tab:'offlineCopyTab',
                                 panel:'offlineCopyPanel'
                 },
                 'SHARING': {
                                 tab:'sharingTab',
                                 panel:'sharingPanel'
                 },
                 'IMPORT': {
                                 tab:'importTab',
                                 panel:'importPanel'
                 },
                 'EXPORT': {
                                 tab:'exportTab',
                                 panel:'exportPanel'
                 }
         };
         
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DataPanel, Clipperz.PM.UI.Common.Components.TabPanelComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.DataPanel component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.append(this.element(), [
                         {tag:'div', cls:'header', children:[
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DateColumnManager.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DateColumnManager.js
index ea55ba4..b305045 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DateColumnManager.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DateColumnManager.js
@@ -1,69 +1,67 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 //#############################################################################
 
 Clipperz.PM.UI.Web.Components.DateColumnManager = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.DateColumnManager.superclass.constructor.call(this, args);
 
                 this._format = args.format|| Clipperz.Base.exception.raise('MandatoryParameter');
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DateColumnManager, Clipperz.PM.UI.Web.Components.ColumnManager, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.DateColumnManager component";
         },
 
         //-------------------------------------------------------------------------
 
         'format': function () {
                 return this._format;
         },
 
         //-------------------------------------------------------------------------
 
         'renderCell': function(aRowElement, anObject) {
                 Clipperz.DOM.Helper.append(aRowElement, {tag:'td', cls:this.cssClass(), children:[
                         {
                                 tag:'span',
                                 title:Clipperz.PM.Date.formatDateWithTemplate(anObject[this.name()], "D, d M Y H:i:s"),
                                 html:Clipperz.PM.Date.formatDateWithTemplate(anObject[this.name()], this.format())
                         }
                 ]});
         },
 
         //-----------------------------------------------------
 
         '__syntax_fix__' : 'syntax fix'
 });
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js
index fe59494..6efe4c6 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js
@@ -1,67 +1,65 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 //#############################################################################
 
 Clipperz.PM.UI.Web.Components.DeleteObjectColumnManager = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.DeleteObjectColumnManager.superclass.constructor.call(this, args);
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DeleteObjectColumnManager, Clipperz.PM.UI.Web.Components.LinkColumnManager, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.DeleteObjectColumnManager component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderCell': function(aRowElement, anObject) {
                 var tdElement;
                 var linkElement;
                 
                 tdElement = Clipperz.DOM.Helper.append(aRowElement, {tag:'td', cls:this.cssClass(), children:[
                         {tag:'div', cls:'delete', children:[
                                 {tag:'span', children:[
                                         {tag:'a', href:'delete', html:"delete"}
                                 ]}
                         ]}
                 ]});
 
                 linkElement = MochiKit.DOM.getFirstElementByTagAndClassName('a', null, tdElement);
         //      MochiKit.Signal.connect(linkElement, 'onclick', MochiKit.Base.method(this, 'handleLinkClick', anObject['_rowObject']));
                 this.connectEvent(linkElement, 'onclick', MochiKit.Base.method(this, 'handleLinkClick', anObject['_rowObject']));
         },
 
         //-----------------------------------------------------
         '__syntax_fix__' : 'syntax fix'
 });
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js
index a1f0f9f..2dad703 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 /*
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 //#############################################################################
 
 Clipperz.PM.UI.Web.Components.DirectLoginColumnManager = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.DirectLoginColumnManager.superclass.constructor.call(this, args);
 
         this._actionMethod = args.actionMethod || null;
         
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DirectLoginColumnManager, Clipperz.PM.UI.Web.Components.ColumnManager, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.DateColumnManager component";
         },
 
         //-------------------------------------------------------------------------
 
         'actionMethod': function () {
                 return this._actionMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'renderCell': function(aRowElement, anObject) {
                         vartdElement;
                         varlinkElement;
 
                 tdElement = Clipperz.DOM.Helper.append(aRowElement, {tag:'td', cls:this.cssClass(), children:[
                         {tag:'div',  cls:'directLogin_directLogin', children:[
                                 {tag:'div', cls:'directLogin_directLogin_body', children:[
                                         {tag:'a', href:'#', html:anObject[this.name()]}
                                 ]}
                         ]}
                 ]});
 
                 linkElement = MochiKit.DOM.getFirstElementByTagAndClassName('a', null, tdElement);
         //      MochiKit.Signal.connect(linkElement, 'onclick', MochiKit.Base.method(this, 'handleLinkClick', anObject['_rowObject']));
                 this.connectEvent(linkElement, 'onclick', MochiKit.Base.method(this, 'handleLinkClick', anObject['_rowObject']));
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js
index 1a76b0c..f5f99d4 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.DirectLoginEditingBindingComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.DirectLoginEditingBindingComponent.superclass.constructor.apply(this, arguments);
 
                 this._formFieldName                             = args.formFieldName|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._fields                                    = args.fields           || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._initiallySelectedFieldKey         = args.selectedFieldKey|| null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DirectLoginEditingBindingComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.DirectLoginEditingBindingComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'formFieldName': function () {
                 return this._formFieldName;
         },
 
         //-------------------------------------------------------------------------
 
         'fields': function () {
                 return this._fields;
         },
 
         //-------------------------------------------------------------------------
 
         'selectedValue': function () {
                 var result;
                 
                 result = this.getElement('select').value;
                 
                 if (result == '---') {
                         result = null;
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js
index 5114b1d..55d2c01 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js
@@ -1,156 +1,153 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.DirectLoginEditingComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.DirectLoginEditingComponent.superclass.constructor.apply(this, arguments);
 
         this._tabPanelController = null;
 
         this._initiallySelectedTab = args.selected || 'TYPE';
         this._tabPanelControllerConfiguration = {
                 'LABEL': {
                                 tab:'labelTab',
                                 panel:'labelTabpanel'
                 },
                 'TYPE': {
                                 tab:'typeTab',
                                 panel:'typeTabpanel'
                 },
                 'CONFIGURATION': {
                                 tab:'configurationTab',
                                 panel:'configurationTabpanel'
                 },
                 'BINDINGS': {
                                 tab:'bindingsTab',
                                 panel:'bindingsTabpanel'
                 },
                 'FAVICON': {
                                 tab:'faviconTab',
                                 panel:'faviconTabpanel'
                 },
                 'DONE': {
                                 tab:'doneTab',
                                 panel:'doneTabpanel'
                 }
         };
 
         this._directLoginReference = null;
 
         this._directLoginFavicon = null;
 
         this._updateFaviconCounter = 0;
         this._faviconComponent = null;
 
                 this._bindingComponents= [];
         this._formValueComponents = [];
 
         return this;
 }
 
 //=============================================================================
 
 //Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DirectLoginEditingComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DirectLoginEditingComponent, Clipperz.PM.UI.Common.Components.TabPanelComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.DirectLoginEditingComponent component";
         },
 
         //=========================================================================
 
         'directLoginReference': function () {
                 return this._directLoginReference;
         },
         
         //-------------------------------------------------------------------------
 
         'setDirectLoginReference': function (aDirectLoginReference) {
                 this._directLoginReference = aDirectLoginReference;
 
                 return this._directLoginReference;
         },
 
         //=========================================================================
 
         'label': function () {
                 return this.getElement('label').value
         },
         
         'setLabel': function (aValue) {
-//console.log("##> LABEL: " + aValue);
                 this.getElement('label').value = (aValue ? aValue : '');
         },
 
         //-------------------------------------------------------------------------
 
         'favicon': function () {
                 return this.getElement('faviconURL').value;
         },
         
         'setFavicon': function (aValue) {
                 var regexp;
                 var displayValue;
 
                 regexp = new RegExp('^data\:\/\/.*', 'i');
                 if (regexp.test(aValue)) {
                         displayValue = ''
                 } else {
                         displayValue = (aValue ? aValue : '');
                 }
 
                 this.getElement('faviconURL').value = displayValue;
                 this.faviconComponent().setSrc(aValue);
         },
 
         //'setFaviconData': function (aValue) {
         //      this.getElement('faviconIcon').src = aValue;
         //},
 
         'directLoginFavicon': function () {
                 return this._directLoginFavicon;
         },
         
         'setDirectLoginFavicon': function (aValue) {
                 this._directLoginFavicon = aValue;
                 this.setFavicon(aValue);
         },
 
         //-------------------------------------------------------------------------
 
         'bookmarkletConfiguration': function () {
                 return this.getElement('bookmarkletConfiguration').value
         },
         
         'setBookmarkletConfiguration': function (aValue) {
                 this.getElement('bookmarkletConfiguration').value = aValue;
         },
 
         'highlightConfigurationSyntaxError': function () {
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js
index fa57233..58b5b26 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js
@@ -1,176 +1,169 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.DirectLoginEditingFormValueComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.DirectLoginEditingFormValueComponent.superclass.constructor.apply(this, arguments);
 
                 this._formFieldName             = args.formFieldName|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._fieldOptions              = args.fieldOptions     || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._initialValue              = args.initialValue     || null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DirectLoginEditingFormValueComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.DirectLoginEditingFormValueComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'formFieldName': function () {
                 return this._formFieldName;
         },
 
         //-------------------------------------------------------------------------
 
         'fieldOptions': function () {
                 return this._fieldOptions;
         },
 
         'fieldType': function () {
                 return this.fieldOptions()['type'];
         },
 
         'optionValues': function () {
                 return MochiKit.Base.map(function (anOptionValue) {
                         return {
                                 'label': anOptionValue['label'] || anOptionValue['value'],
                                 'value': anOptionValue['value']
                         }
                 }, this.fieldOptions()['options']);
         },
 
         //-------------------------------------------------------------------------
 
         'selectedValue': function () {
                 var result;
                 
                 result = this.getElement('select').value;
                 
                 if (result == '---') {
                         result = null;
                 }
 
                 return result;
         },
 
         'initialValue': function () {
                 return this._initialValue;
         },
 
         //=========================================================================
 
         'renderSelf': function() {
-//console.log(">>> DirectLoginEditingFormValueComponent.renderSelf");
-//console.log("FIELD OPTIONS", this.fieldOptions());
-//console.log("OPTION VALUES", this.optionValues());
                 this.append(this.element(), {tag:'div', id:this.getId('div'), cls:'formValue', children:[
                         {tag:'span', cls:'formFieldName', html:this.formFieldName()},
                         {tag:'div', id:this.getId('values')}
                 ]});
 
                 if ((this.fieldType() == 'radio') || (this.fieldType() == 'select')) {
                         this.append(this.getElement('values'),
                                 {tag:'select', name:this.formFieldName(), id:this.getId('select'), cls:'formFieldMatchinCardField', children:
                                         MochiKit.Base.flattenArguments(
         //                                      {tag:'option', value:'---', html:"---"},
                                                 MochiKit.Base.map(
                                                         MochiKit.Base.bind(function (aValue) { return {tag:'option', value:aValue['value'], html:aValue['label']}; }, this),
                                                         this.optionValues()
                                                         )
                                         )
                                 }
                         );
                         
                                 MochiKit.Signal.connect(this.getElement('select'), 'onchange', this, 'handleSelectChange');
 
                         if (! MochiKit.Base.isUndefinedOrNull(this.initialValue())) {
                                 var initiallySelectedOptions;
                                 initiallySelectedOptions = MochiKit.Selector.findChildElements(this.element(), ['option[value=' + this.initialValue() + ']']);
                                 if (initiallySelectedOptions.length == 1) {
                                         MochiKit.DOM.updateNodeAttributes(initiallySelectedOptions[0], {selected:true});
                                         this.handleSelectChange();
                                 } else {
                                         Clipperz.DOM.Helper.insertBefore(this.getElement('select').childNodes[0], {tag:'option', value:'---', html:"", selected:true});
                                 }
                         } else {
                                 Clipperz.DOM.Helper.insertBefore(this.getElement('select').childNodes[0], {tag:'option', value:'---', html:"", selected:true});
                         }
                 } else if (this.fieldType() == 'checkbox') {
                         this.append(this.getElement('values'),
                                 {tag:'input', type:'checkbox', name:this.formFieldName(), id:this.getId('checkbox'), cls:'formFieldMatchinCardField'}
                         );
 
                         MochiKit.Signal.connect(this.getElement('checkbox'), 'onchange', this, 'handleSelectChange');
 
                         if (this.initialValue()) {
                                 MochiKit.DOM.updateNodeAttributes(this.getElement('checkbox'), {checked:true});
                         }
                 } else {
                         WTF = TODO;
                 }
-//console.log("<<< DirectLoginEditingFormValueComponent.renderSelf");
         },
 
         //=========================================================================
 
         'handleSelectChange': function (anEvent) {
-//console.log("handleSelectChange", anEvent, anEvent.src(), anEvent.src().value);
                 var options;
 
                 options = {};
                 
                 options['fieldName'] = this.formFieldName();
 
                 if (this.fieldType() == 'checkbox') {
                         options['selectedValue'] = (this.getElement('checkbox').checked ? 1 : null);
                 } else {
                         options['selectedValue'] = this.selectedValue();
                 }
 
                 MochiKit.Signal.signal(this, 'formValueChange', options);
         },
 
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
 
 
 
 
 
 
 
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js
index d8dc941..b4fc24e 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 //#############################################################################
 
 Clipperz.PM.UI.Web.Components.DirectLoginsColumnManager = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.DirectLoginsColumnManager.superclass.constructor.call(this, args);
         
         this._enterLeaveCounter = 0;
         this._selectedRowObject = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DirectLoginsColumnManager, Clipperz.PM.UI.Web.Components.ColumnManager, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.DirectLoginsColumnManager component";
         },
         
         //-------------------------------------------------------------------------
 
         'renderHeader': function(aTRElement) {
                 Clipperz.PM.UI.Web.Components.DirectLoginsColumnManager.superclass.renderHeader.call(this, aTRElement);
 
                 Clipperz.DOM.Helper.append(MochiKit.DOM.currentDocument().body, {tag:'div', cls:'DirectLoginListPopup', id:this.getId('DirectLoginListPopup'), children:[
                         {tag:'div', cls:'DirectLoginListPopup_body', children:[
                                 {tag:'ul', id:this.getId('DirectLoginListPopup_list'), children:[
         //                              {tag:'li', children:[
         //                                      {tag:'img', cls:'favicon', src:'http://www.microsoft.com/favicon.ico'},
         //                                      {tag:'a', href:'#', html:"Google Mail"}
         //                              ]},
         //                              ...
                                 ]}
                         ]},
                         {tag:'div', cls:'DirectLoginListPopup_footer'}
                 ]});
 
                 MochiKit.Style.hideElement(this.getId('DirectLoginListPopup'));
 
                         //BEWARE: use MochiKit.Signal.connect instead of this.connectEvent, as the HEADER is NOT redrawn after each refresh
                 MochiKit.Signal.connect(this.getId('DirectLoginListPopup'), 'onmouseenter', this, 'handleDirectLoginListPopupEnter');
                 MochiKit.Signal.connect(this.getId('DirectLoginListPopup'), 'onmouseleave', this, 'handleDirectLoginListPopupLeave');
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/FaviconColumnManager.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/FaviconColumnManager.js
index 6297002..bdb044a 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/FaviconColumnManager.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/FaviconColumnManager.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 //#############################################################################
 
 Clipperz.PM.UI.Web.Components.FaviconColumnManager = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.FaviconColumnManager.superclass.constructor.call(this, args);
         
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.FaviconColumnManager, Clipperz.PM.UI.Web.Components.ColumnManager, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.FaviconColumnManager component";
         },
         
         //-------------------------------------------------------------------------
 
         'renderCell': function(aRowElement, anObject) {
                         varfaviconImageElement;
                 var faviconUrl;
                 
                 faviconImageElement = this.getId('favicon');
                 faviconUrl = anObject[this.name()];
 
                 if (faviconUrl == null) {
                         faviconUrl = Clipperz.PM.Strings.getValue('defaultFaviconUrl');
                 }
 
                 Clipperz.DOM.Helper.append(aRowElement, {tag:'td', cls:this.cssClass(), children:[
                         {tag:'img', id:faviconImageElement, src:faviconUrl}
                 ]});
 
                 MochiKit.Signal.connect(faviconImageElement, 'onload',  this, 'handleLoadedFaviconImage');
                 MochiKit.Signal.connect(faviconImageElement, 'onerror', this, 'handleMissingFaviconImage');
                 MochiKit.Signal.connect(faviconImageElement, 'onabort', this, 'handleMissingFaviconImage');
         },
 
         //-----------------------------------------------------
 
         'handleLoadedFaviconImage': function(anEvent) {
                 MochiKit.Signal.disconnectAllTo(anEvent.src());
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/GridComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/GridComponent.js
index 51d55f4..21dddc9 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/GridComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/GridComponent.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.GridComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.GridComponent.superclass.constructor.apply(this, arguments);
 
         this._columnsManagers = args.columnsManagers;
 
         this._rowsObjects = [];
         this._noRowsGridComponent = null;
         
         this._slots = {
                         'headerSlot':this.getId('headerSlot')
         };
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.GridComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.GridComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'rows': function () {
                 throw Clipperz.Base.exception.AbstractMethod;
         //      return this._rows;
         },
 
         //-------------------------------------------------------------------------
 
         'columnsManagers': function () {
                 return this._columnsManagers;
         },
         
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
@@ -80,103 +78,101 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.GridComponent, Clipperz.PM.UI
                                 ]}
                         ]},
                         {tag:'div', cls:'body', children:[
                                 {tag:'div', cls:'rows', id:this.getId('rows'), children:[
                                         {tag:'table', cellpadding:'0', cellspacing:'0', cls:'rows', children:[
                                                 {tag:'thead', children:[
                                                         {tag:'tr', id:this.getId('thead_tr'), children:[]}
                                                 ]},
                                                 {tag:'tbody', id:this.getId('gridRows'), children:[]}
                                         ]}
                                 ]},
                                 {tag:'div', cls:'noRowsBlock', id:this.getId('noRowsBlock'), children:[]}
                         ]},
                         {tag:'div', cls:'footer'}
                 ]);
 
                 this.renderHeader();
                 MochiKit.Signal.connect(this.getId('clearSearch'), 'onclick', this, 'clearSearchHandler');
         },
 
         //-------------------------------------------------------------------------
 
         'renderHeader': function () {
                 var headerElement;
                 
                 headerElement = this.getElement('thead_tr');
                 headerElement.innerHTML = "";
 
                 MochiKit.Iter.forEach(this.columnsManagers(), function (aColumnManager) {
                         aColumnManager.renderHeader(headerElement);
                 });
         },
 
         //-------------------------------------------------------------------------
 
         'update': function (someObjects) {
                 this._rowsObjects = someObjects
                 this.refresh();
                 this.focus();
         },
 
         'focus': function () {
                 this.getElement('search').focus();
         },
 
         //-------------------------------------------------------------------------
 
         'startSearch': function () {
-//console.log("--> startSearch");
                 MochiKit.DOM.addElementClass(this.getElement('search'), 'running');
         },
 
         'endSearch': function () {
                 MochiKit.DOM.removeElementClass(this.getElement('search'), 'running');
-//console.log("<-- startSearch");
         },
 
         //-------------------------------------------------------------------------
 
         'disconnectColumnManagersRowsSignals': function () {
                 MochiKit.Iter.forEach(this.columnsManagers(), function (aColumnManager) {
                         aColumnManager.disconnectRowsSignals();
                 });
         },
 
         //-------------------------------------------------------------------------
 
         'refresh': function () {
                 var gridRowsElement;
                 var rowClass;
 
                 this.disconnectColumnManagersRowsSignals();
 
                 {
                         MochiKit.DOM.removeElementClass(this.getElement('search'), 'disabled');
         //              MochiKit.DOM.setNodeAttribute(this.getElement('search'), 'disabled', null);
                         MochiKit.DOM.removeElementClass(this.element(), 'empty');
                         MochiKit.DOM.removeElementClass(this.element(), 'noRows');
                 }
 
                 
                 gridRowsElement = this.getElement('gridRows');
                 gridRowsElement.innerHTML = "";
 
                 MochiKit.DOM.removeElementClass(this.element(), 'empty');
                 
                 rowClass = 'odd';
                 MochiKit.Iter.forEach(this._rowsObjects, MochiKit.Base.bind(function (aRowObject) {
                         var cardRowElement;
 
                         cardRowElement = this.append(gridRowsElement, {tag:'tr', id:this.getId(aRowObject['_reference']), cls:rowClass});
                         MochiKit.Iter.forEach(this.columnsManagers(), function (aColumnManager) {
                                 aColumnManager.renderCell(cardRowElement, aRowObject);
                         });
                         
                         rowClass = (rowClass == 'odd') ? 'even' : 'odd';
                 }, this));
         },
 
         //-----------------------------------------------------------------------------
         
         'filterElement': function () {
                 return this.getElement('search');
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ImageColumnManager.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ImageColumnManager.js
index 3e03fcf..d1d9d7f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ImageColumnManager.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ImageColumnManager.js
@@ -1,65 +1,63 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 //#############################################################################
 
 Clipperz.PM.UI.Web.Components.ImageColumnManager = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.ImageColumnManager.superclass.constructor.call(this, args);
         
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.ImageColumnManager, Clipperz.PM.UI.Web.Components.ColumnManager, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.ImageColumnManager component";
         },
         
         //-------------------------------------------------------------------------
 
         'renderCell': function(aRowElement, anObject) {
                 Clipperz.DOM.Helper.append(aRowElement, {tag:'td', cls:this.cssClass(), children:[
                         {tag:'img', src:anObject[this.name()]}
                 ]});
 
         //      return Clipperz.Async.callbacks("ImageColumnManager.renderCell", [
         //              this.selector(),
         //              MochiKit.Base.bind(function (aValue) {
         //                      Clipperz.DOM.Helper.append(aRowElement, {tag:'td', cls:this.cssClass(), children:[
         //                              {tag:'img', src:aValue}
         //                      ]});
         //              }, this)
         //      ], {trace:false}, anObject);
         },
 
         //-----------------------------------------------------
                 '__syntax_fix__' : 'syntax fix'
 });
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LinkColumnManager.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LinkColumnManager.js
index f3f9cd5..69f735b 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LinkColumnManager.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LinkColumnManager.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 //#############################################################################
 
 Clipperz.PM.UI.Web.Components.LinkColumnManager = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.LinkColumnManager.superclass.constructor.call(this, args);
 
         this._actionMethod = args.actionMethod || null;
         
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LinkColumnManager, Clipperz.PM.UI.Web.Components.ColumnManager, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.DateColumnManager component";
         },
 
         //-------------------------------------------------------------------------
 
         'actionMethod': function () {
                 return this._actionMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'renderCell': function(aRowElement, anObject) {
                         vartdElement;
                         varlinkElement;
 
                 tdElement = Clipperz.DOM.Helper.append(aRowElement, {tag:'td', cls:this.cssClass(), children:[
                         {tag:'span', children:[
                                 {tag:'a', href:'#', html:anObject[this.name()]}
                         ]}
                 ]});
 
                 linkElement = MochiKit.DOM.getFirstElementByTagAndClassName('a', null, tdElement);
         //      MochiKit.Signal.connect(linkElement, 'onclick', MochiKit.Base.method(this, 'handleLinkClick', anObject['_rowObject']));
                 this.connectEvent(linkElement, 'onclick', MochiKit.Base.method(this, 'handleLinkClick', anObject['_rowObject']));
         },
 
         //-----------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
index a10ba4f..38a9421 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginForm.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.LoginForm = function(args) {
         args = args || {};
 
         this._autocomplete = args.autocomplete || 'off';
 
         Clipperz.PM.UI.Web.Components.LoginForm.superclass.constructor.apply(this, arguments);
 
         this._slots = {
                         'passphraseEntropy':this.getId('passphraseEntropy')
         };
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginForm, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.LoginForm component";
         },
 
         'autocomplete': function () {
                 return this._autocomplete;
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
                 this.append(this.element(), {tag:'div', id:'loginBox', children:[
                         {tag:'div', cls:'header'},
                         {tag:'div', cls:'body', id:this.getId('body'), children:[
                                 {tag:'div', id:this.getId('loginForm'), children:[
                                         {tag:'div', children:[
                                                 {tag:'h4', html:'Login'},
         //                                      {tag:'form', cls:'loginForm', autocomplete:this.autocomplete(), children:[
                                                 {tag:'form', id:this.getId('form'), cls:'loginForm', children:[
                                                         {tag:'label', html:'username', 'for':this.getId('usernameField')},
                                                         {tag:'input', id:this.getId('usernameField'), type:'text', cls:'username'},
                                                         {tag:'label', html:'passphrase / OTP', 'for':this.getId('passphraseField')},
                                                         {tag:'input', id:this.getId('passphraseField'), type:'password', cls:'password'},
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginPage.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginPage.js
index 2894af8..3498e3f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginPage.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginPage.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.LoginPage = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.LoginPage.superclass.constructor.apply(this, arguments);
 
         this._slots = {
                         'loginForm':this.getId('loginBoxSlot')
         };
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginPage, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.LoginPage component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.append(this.element(), [
                         {tag:'div', id:this.getId('loginBoxSlot')},
                         {tag:'div', id:'main', children:[
                                 {tag:'div', id:'featurePoints', children:[
                                         {tag:'table', children:[
                                                 {tag:'tr', children:[
                                                         {tag:'td', children:[
                                                                 {tag:'div', cls:'block', children:[
                                                                         {tag:'h3', html:'Clipperz is:'},
                                                                         {tag:'ul', children:[
                                                                                 {tag:'li', html:'a secure and simple password manager'},
                                                                                 {tag:'li', html:'an effective single sign-on solution'},
                                                                                 {tag:'li', html:'a digital vault for your personal data'}
                                                                         ]}
                                                                 ]},
                                                                 {tag:'div', cls:'block', children:[
                                                                         {tag:'h3', html:'Clipperz benefits:'},
                                                                         {tag:'ul', children:[
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js
index 26506e7..3fef6c5 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/LoginProgress.js
@@ -1,117 +1,114 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.LoginProgress = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.LoginProgress.superclass.constructor.apply(this, arguments);
 
         this._deferred = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.LoginProgress, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.LoginProgress component";
         },
 
         //-------------------------------------------------------------------------
 
         'deferred': function() {
                 return this._deferred;
         },
 
         'setDeferred': function(aValue) {
                 this._deferred = aValue;
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
         //      var loginProgressElement;
         //      
         //      loginProgressElement = MochiKit.DOM.getElement('loginProgress');
         //      
         //      if (loginProgressElement == null) {
         //              loginProgressElement = this.append(this.element(), {tag:'div', id:'loginProgress', cls:'LoginProgress'}, true);
         //      }
 
-//console.log(">> LoginProgress.renderSelf", this.element());
                 this.append(this.element(), {tag:'div', id:'loginProgress', cls:'LoginProgress', children: [
         //      this.append(loginProgressElement, [
                         {tag:'div', cls:'header', children:[
                                 {tag:'h3', id:this.getId('title'), html:"login progress"}
                         ]},
                         {tag:'div', cls:'body', children:[
                                 {tag:'div', id:this.getId('progressBar')},
                                 {tag:'div', id:this.getId('errorBox'), cls:'errorBox', children:[
         //                                      {tag:'div',cls:'img ALERT', children:[{tag:'div'}]},
                                                 {tag:'div',cls:'img ALERT', children:[{tag:'canvas', id:this.getId('canvas')}]},
                                         {tag:'p', html:"Login failed"}
                                 ]}
                         ]},
                         {tag:'div', cls:'footer', children:[
                                 {tag:'div', cls:'buttonArea', id:this.getId('buttonArea'), children:[
         //                              {tag:'div', cls:'button', id:this.getId('button'), children:[
         //                                      {tag:'a', href:'#', id:this.getId('buttonLink'), html:"cancel"}
         //                              ]}
                                         {tag:'a', cls:'button', id:this.getId('button'), html:"cancel"}
                                 ]}
                         ]}
                 ]});
         //      ]);
 
                 Clipperz.PM.UI.Canvas.marks['!'](this.getElement('canvas'), "#ffffff");
 
                 this.addComponent(new Clipperz.PM.UI.Common.Components.ProgressBar({'element':this.getElement('progressBar')}));
                 MochiKit.Style.hideElement(this.getElement('errorBox'));
                 
         //      MochiKit.Signal.connect(this.getId('buttonLink'), 'onclick', this, 'cancelEventHandler');
                 MochiKit.Signal.connect(this.getId('button'), 'onclick', this, 'cancelEventHandler');
         },
 
         //-------------------------------------------------------------------------
 
         'displayElement': function() {
                 return MochiKit.DOM.getElement('loginProgress');
         },
 
         //-------------------------------------------------------------------------
 
         'cancelEventHandler': function(anEvent) {
                 anEvent.preventDefault();
                 
                 MochiKit.Signal.signal(this, 'cancelEvent');
         },
 
         //-------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js
index feb16ad..06746d1 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.NewUserCreationComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.NewUserCreationComponent.superclass.constructor.apply(this, arguments);
 
         this._tabPanelController = null;
 
         this._initiallySelectedTab = args.selected || 'CREDENTIALS';
         this._tabPanelControllerConfiguration = {
                 'CREDENTIALS': {
                                 tab:'credentialsTab',
                                 panel:'credentialsTabpanel'
                 },
                 'CHECK_CREDENTIALS': {
                                 tab:'checkCredentialsTab',
                                 panel:'checkCredentialsTabpanel'
                 },
                 'TERMS_OF_SERVICE': {
                                 tab:'termsOfServiceTab',
                                 panel:'termsOfServiceTabpanel'
                 },
                 'CREATE_USER': {
                                 tab:'createUserTab',
                                 panel:'createUserTabpanel'
                         }//,
 /*
                 'LOGIN': {
                                 tab:'loginTab',
                                 panel:'loginTabpanel'
                 }
 */
         };
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Clipperz.PM.UI.Common.Components.TabPanelComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
@@ -78,98 +76,96 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Cli
         },
 
         //-------------------------------------------------------------------------
 
         'enableCredentialsPanel': function () {
                 this.tabPanelController().selectTab('CREDENTIALS');
         },
 
         'enableCheckCredentialsPanel': function () {
                 this.tabPanelController().selectTab('CHECK_CREDENTIALS');
         },
 
         'enableTermsOfServicePanel': function () {
                 this.tabPanelController().selectTab('TERMS_OF_SERVICE');
         },
 
         'enableCreateUserPanel': function () {
                 this.tabPanelController().selectTab('CREATE_USER');
         },
 
         //'enableLoginPanel': function () {
         //      this.tabPanelController().selectTab('LOGIN');
         //},
 
         //=========================================================================
 
         'shouldShowElementWhileRendering': function() {
                 return false;
         },
         
         //=========================================================================
 
         'tabPanelController': function () {
                 if (this._tabPanelController == null) {
                         this._tabPanelController = new Clipperz.PM.UI.Common.Controllers.TabPanelController({
                                 component:this,
                                 configuration:this._tabPanelControllerConfiguration
                         });
                         
                         MochiKit.Signal.connect(this._tabPanelController, 'tabSelected', this, 'handleTabSelected')
                 }
                 
                 return this._tabPanelController;
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function() {
-//console.log('** Clipperz.targetModalDimensionsAndPosition', Clipperz.Base.serializeJSON(Clipperz.PM.UI.Common.Components.BaseComponent.targetModalDimensionsAndPosition));
-
                 this.append(this.element(), {tag:'div', cls:'NewUserCreation mainDialog', id:this.getId('panel'), children: [
                         {tag:'form', id:this.getId('form'), cls:'newUserCreationForm', children:[
                                 {tag:'div', cls:'header', children:[
                                         {tag:'div', cls:'title', children:[
                                                 {tag:'h3', id:this.getId('title'), html:"Create new user"}
                                         ]}
                                 ]},
                                 {tag:'div', id:this.getId('body'), cls:'body', children:[
                                         {tag:'div', cls:'tabContainer', children:[
                                                 {tag:'ul', cls:'tabs', children:[
                                                                 {tag:'li', id:this.getId('credentialsTab'),             children:[{tag:'span', html:"credentials"}]},
                                                                 {tag:'li', id:this.getId('checkCredentialsTab'),children:[{tag:'span', html:"credentials check"}]},
                                                                 {tag:'li', id:this.getId('termsOfServiceTab'),  children:[{tag:'span', html:"terms of service"}]},
                                                                 {tag:'li', id:this.getId('createUserTab'),                      children:[{tag:'span', html:"create user"}]}//,
         //                                                      {tag:'li', id:this.getId('loginTab'),                   children:[{tag:'span', html:"login"}]},
                                                 ]},
                                                 {tag:'ul', cls:'tabPanels', children:[
                                                         {tag:'li', id:this.getId('credentialsTabpanel'), cls:'tabPanel credentials', children:[
                                                                 {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREDENTIALS.description')}]},
                                                                 {tag:'ul', cls:'credentials', children:[
                                                                                 {tag:'li', children:[{tag:'span', cls:'label', html:"username"},{tag:'input', type:'text', id:this.getId('username')/*, value:'test'*/}]},
                                                                                 {tag:'li', children:[{tag:'span', cls:'label', html:"passphrase"},{tag:'input', type:'password', id:this.getId('passphrase')/*, value:'test'*/}]}
                                                                 ]}
                                                         ]},
                                                         {tag:'li', id:this.getId('checkCredentialsTabpanel'), cls:'tabPanel checkCredentials', children:[
                                                                 {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CHECK_CREDENTIALS.description')}]},
                                                                 {tag:'ul', cls:'credentials', children:[
                                                                                 {tag:'li', children:[{tag:'span', cls:'label', html:"re-passphrase"},{tag:'input', type:'password', id:this.getId('re-passphrase')/*, value:'test'*/}]}
                                                                 ]}
                                                         ]},
                                                         {tag:'li', id:this.getId('termsOfServiceTabpanel'), cls:'tabPanel termsOfService', children:[
                                                                 {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.TERMS_OF_SERVICE.description')}]},
                                                                 {tag:'ul', cls:'termsOfService', children:[
                                                                         {tag:'li', children:[{tag:'input', type:'checkbox', id:this.getId('awareOfUnrecoverablePassphrase')/*, checked:true*/}, {tag:'label', cls:'label', 'for':this.getId('awareOfUnrecoverablePassphrase'), html:"I understand that Clipperz will not be able to recover a lost passphrase."}]},
                                                                         {tag:'li', children:[{tag:'input', type:'checkbox', id:this.getId('readTermsOfService')/*, checked:true*/}, {tag:'label', cls:'label', 'for':this.getId('readTermsOfService'), htmlString:"I have read and agreed to the <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Terms of Service</a>."}]}
                                                                 ]}
                                                         ]},
                                                         {tag:'li', id:this.getId('createUserTabpanel'), cls:'tabPanel createUser', children:[
                                                                 {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.CREATE_USER.description')}]},
                                                                 {tag:'ul', cls:'createUserStates', children:[
                                                                         {tag:'li', cls:'creating', id:this.getId('creatingRegistering'), children:[{tag:'span', html:"registering user"}]},
                                                                         {tag:'li', cls:'done', id:this.getId('creatingDone'), children:[{tag:'span', html:"done"}]},
                                                                         {tag:'li', cls:'fail', id:this.getId('creatingFailed'), children:[{tag:'span', html:"fail"}]}
                                                                 ]}
                                                                 ]}//,
         //                                              {tag:'li', id:this.getId('loginTabpanel'), cls:'tabPanel login', children:[
         //                                                      {tag:'div', cls:'wizardStepDescription', children:[{tag:'span', html:Clipperz.PM.Strings.getValue('Wizards.NewUserWizard.LOGIN.description')}]},
         //                                              ]}
@@ -288,100 +284,96 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Cli
                 this.bindingComponents().push(aBindingComponent);
                 aBindingComponent.renderInNode(this.append(this.getElement('bindings'), {tag:'div'}));
         },
 */
         //=========================================================================
 /*
         'formValueComponents': function () {
                 return this._formValueComponents;
         },
         
         'clearAllFormValueComponents': function () {
                 MochiKit.Iter.forEach(this.formValueComponents(), MochiKit.Base.methodcaller('remove'));
                 this._formValueComponents = [];
                 this.getElement('formValues').innerHTML = '';
         },
 
         'addFormValueComponent': function (aFormValueComponent) {
                 this.formValueComponents().push(aFormValueComponent);
                 aFormValueComponent.renderInNode(this.append(this.getElement('formValues'), {tag:'div'}));
         },
 */
         //=========================================================================
 
         'changedValue': function (anEvent) {
                 MochiKit.Signal.signal(this, 'changedValue', anEvent);
 
                 this.incrementUpdateFaviconCounter();
                 MochiKit.Async.callLater(1, MochiKit.Base.method(this, 'updateFavicon'));
         },
 
         //-------------------------------------------------------------------------
 
         'handleBackClick': function (anEvent) {
                 anEvent.preventDefault();
                 
                 MochiKit.Signal.signal(this, 'back');
         },
 
         //=========================================================================
 
         'bottomMargin': function () {
                 var result;
 
         //TODO: WTF!!!
         //              result =MochiKit.Style.getElementPosition(this.element())['y'] +
         //                              MochiKit.Style.getElementDimensions(this.element())['h'];
 
         //              result =MochiKit.Style.getElementPosition(this.getElement('footer'))['y'];
-//console.log("### bottomMargin");
-//console.log('displayElement', this.displayElement());
-//console.log('-- Clipperz.targetModalDimensionsAndPosition', Clipperz.Base.serializeJSON(Clipperz.PM.UI.Common.Components.BaseComponent.targetModalDimensionsAndPosition));
-//console.log('element', MochiKit.Style.getElementPosition('modalDialog') ['y'], MochiKit.Style.getElementDimensions('modalDialog')['h']);
         //      result = 450;
 
                         result =Clipperz.PM.UI.Common.Components.BaseComponent.targetModalDimensionsAndPosition['position']['y'] +
                                         Clipperz.PM.UI.Common.Components.BaseComponent.targetModalDimensionsAndPosition['dimensions']['h'] -
                                         60;
 
                 return result;
         },
 
         //=========================================================================
         
         'focusOnUsernameElement': function () {
                 MochiKit.Async.callLater(0.1, MochiKit.Base.method(this.getElement('username'), 'focus'));
         },
 
         'focusOnRePassphraseElement': function () {
                 this.getElement('re-passphrase').focus();
         },
         /*
         'focusOnBookmarkletConfigurationElement': function () {
                 this.getElement('bookmarkletConfiguration').focus();
         },
 
         'focusOnFaviconElement': function () {
                 this.getElement('faviconURL').focus();
         },
 */
 
         //=========================================================================
 
         'hideAllProgeressStates': function () {
                 MochiKit.Style.hideElement(this.getElement('creatingRegistering'));
                 MochiKit.Style.hideElement(this.getElement('creatingDone'));
                 MochiKit.Style.hideElement(this.getElement('creatingFailed'));
         },
 
         'showProgressOnUserCreation': function () {
 //Clipperz.log(">>> NewUserCreationComponent.showProgressOnUserCreation");
                 this.hideAllProgeressStates();
                 MochiKit.Style.showElement(this.getElement('creatingRegistering'));
         },
 
         'showUserCreationDone': function () {
 //Clipperz.log(">>> NewUserCreationComponent.showUserCreationDone");
                 this.hideAllProgeressStates();
                 MochiKit.Style.showElement(this.getElement('creatingDone'));
 //Clipperz.log("<<< NewUserCreationComponent.showUserCreationDone");
         },
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/Page.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/Page.js
index 3cc5a37..30cbeb2 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/Page.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/Page.js
@@ -1,68 +1,66 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.Page = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.Page.superclass.constructor.apply(this, arguments);
 
         this._slots = {
                         'header':'pageHeader',
                         'body':         'pageBody',
                         'footer':'pageFooter'
         };
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.Page, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.Page component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.append(this.element(), [
                         {tag:'div', id:'pageHeaderAndBody', cls:'pageHeaderAndBody', children:[
                                 {tag:'div', id:'pageHeader', cls:'pageHeader'},
                                 {tag:'div', id:'pageBody',   cls:'pageBody'}
                         ]},
                         {tag:'div', id:'pageFooter', cls:'pageFooter'}
                 ]);
                 
         },
 
         //-------------------------------------------------------------------------
 
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
index dcf506f..df3ca0c 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageFooter.js
@@ -1,67 +1,65 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.PageFooter = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.PageFooter.superclass.constructor.apply(this, arguments);
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageFooter, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.PageFooter component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.append(this.element(), [
                         {tag:'div', cls:'footerWrapper', children:[
                                 {tag:'div', cls:'footerContent', children:[
                                         {tag:'canvas', id:this.getId('footerStarIcon'), cls:'footerStarIcon'},
                                         {tag:'span', cls:'copyright', html:'Copyright &copy; 2009-2013 Clipperz Srl'},
                                                 {tag:'a', href:'http://www.clipperz.com/terms_of_service',target:'_blank', html:'terms of service'},
                                                 {tag:'a', href:'http://www.clipperz.com/privacy_policy',target:'_blank', html:'privacy policy'},
                                         {tag:'div', cls:'applicationVersion', htmlString:'application version: <a href="https://github.com/clipperz/password-manager/tree/' + Clipperz_version + '" target="github">' + Clipperz_version + '</a>'}
                                 ]}
                         ]}
                 ]);
 
                 Clipperz.PM.UI.Canvas.star.normal(this.getElement('footerStarIcon'), "#7e7e7e");
         },
 
         //-------------------------------------------------------------------------
 
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js
index b8f3b05..5e49fb5 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.PageHeader = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.PageHeader.superclass.constructor.apply(this, arguments);
         this._newsIsOpen = args.newsIsOpen || false;
         this._animationDuration = args.animationDuration || 0.5;
         
         this._offset = 82;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.PageHeader component";
         },
 
         //-------------------------------------------------------------------------
 
         'iframeURL': function () {
         //      return './rss_view.html';
                 return 'http://www.clipperz.com/files/clipperz.com/appTips/index.html';
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.append(this.element(), [
                         {tag:'div', id:'miscLinks', children:[
                                 {tag:'ul', children:[
                                                 {tag:'li', children:[{tag:'a', id:'donateHeaderLink',   stringID:'pageHeader.donation',         href:'http://www.clipperz.com/donations',               target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.donation')}]},
                                                 {tag:'li', children:[{tag:'a', id:'forumHeaderLink',    stringID:'pageHeader.forum',    href:'http://www.clipperz.com/forum',                   target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.forum')}]},
                                                 {tag:'li', children:[{tag:'a', id:'creditsHeaderLink',  stringID:'pageHeader.credits',  href:'http://www.clipperz.com/credits',                         target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.credits')}]},
                                                 {tag:'li', children:[{tag:'a', id:'feedbackHeaderLink',         stringID:'pageHeader.feedback',         href:'http://www.clipperz.com/contact',                         target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.feedback')}]},
                                                 {tag:'li', children:[{tag:'a', id:'helpHeaderLink',             stringID:'pageHeader.help',             href:'http://www.clipperz.com/support/user_guide',target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.help')}]}
                                 ]}
                         ]},
                         {tag:'div', id:'logoFrame', children:[
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PasswordTooltip.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PasswordTooltip.js
index 987e51e..5eb0c1f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PasswordTooltip.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PasswordTooltip.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Common.Components');
 
 Clipperz.PM.UI.Web.Components.PasswordTooltip = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.PasswordTooltip.superclass.constructor.apply(this, arguments);
 
                 this._referenceElement  = args.referenceElement|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._text                              = args.text                     || Clipperz.Base.exception.raise('MandatoryParameter');
 
         this._boxDimensions = null;
         this._isVisible = false;
 
         this.renderSelf();
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PasswordTooltip, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.PasswordTooltip component";
         },
 
         //-------------------------------------------------------------------------
 
         'referenceElement': function () {
                 return this._referenceElement;
         },
 
         //-------------------------------------------------------------------------
 
         'text': function () {
                 return this._text;
         },
         
         'setText': function (aValue) {
                 this._text = aValue;
         },
 
         //-------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/RulerComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/RulerComponent.js
index 69c1ede..ad8d677 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/RulerComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/RulerComponent.js
@@ -1,163 +1,160 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.RulerComponent = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.RulerComponent.superclass.constructor.apply(this, arguments);
 
                 this._translationContext        = args.translationContext|| Clipperz.Base.exception.raise('MandatoryParameter');
         //      this._steps                                     = args.steps                    || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._steps                             = args.steps;
 
         this._currentStep = -1;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.RulerComponent, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.RulerComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'resetStatus': function (args) {
                 args = args || {};
 
                 if (this.currentStep() != 0) {
                         var shouldAnimateTransition;
                 
                         shouldAnimateTransition = args.animateTransition || false;
 
                         if (shouldAnimateTransition) {
                                 this.moveToFirstStep(MochiKit.Base.method(this, 'cursorMoved'));
                         } else {
                                 this._currentStep = 0;
                                 this.cursorMoved();
                         }
                 }
         },
         
         //-------------------------------------------------------------------------
 
         'translationContext': function () {
                 return this._translationContext;
         },
 
         'steps': function () {
                 return this._steps;
         },
 
         'setSteps': function (aValue) {
                 this._steps = aValue;
                 this.renderStepsComponents();
                 this.resetStatus();
         },
 
         'translatedStepDescription': function (aStep) {
                 return Clipperz.PM.Strings.getValue(this.translationContext() + '.' + aStep + '.' + 'name');
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.setElement(this.append(MochiKit.DOM.currentDocument().body, [
                         {tag:'div', id:this.getId('rulerWrapper'), cls:'rulerWrapper fixed', children:[
                                 {tag:'div', cls:'ruler', children:[
                                         {tag:'a', href:'#', id:this.getId('exit'), cls:'exit', html:'&nbsp;'},
                                                 {tag:'a', href:'#', id:this.getId('smallPreviousButton'),cls:'smallButton previous', html:'&nbsp;'},
                                                 {tag:'a', href:'#', id:this.getId('smallNextButton'),           cls:'smallButton next',         html:'&nbsp;'},
                                         {tag:'div', cls:'marker', id:this.getId('marker'), children:[
                                                 {tag:'div', cls:'previous', id:this.getId('previousButton')},
                                                 {tag:'div', cls:'markerBody'},
                                                 {tag:'div', cls:'next', id:this.getId('nextButton')}
                                         ]},
                                         {tag:'div', cls:'steps', id:this.getId('stepsFrame')},
         //                              {tag:'div', cls:'steps' + ' ' + 'steps_' + this.steps().length, children:[
         //                                      {tag:'ul', id:this.getId('steps'), children:MochiKit.Base.map(MochiKit.Base.bind(function (aStep) { return {tag:'li', children:[{tag:'span', html:this.translatedStepDescription(aStep)}]}}, this), this.steps())}
         //                              ]},
                                         {tag:'div', cls:'dots', id:this.getId('dotsFrame')}
         //                              {tag:'div', cls:'dots' + ' ' + 'steps_' + this.steps().length, children:[
         //                                      {tag:'ul', id:this.getId('dots'), children:MochiKit.Base.map(function (aStep) { return {tag:'li', children:[{tag:'span', html:'*'}]}}, this.steps())}
         //                              ]}
                                 ]}
                         ]}
                 ]));
-//console.log("ELEMENT", this.element());
 
                         MochiKit.Signal.connect(this.getElement('exit'),                        'onclick', this, 'handleExit');
 
                         MochiKit.Signal.connect(this.getElement('previousButton'),      'onclick', this, 'handlePrevious');
                         MochiKit.Signal.connect(this.getElement('smallPreviousButton'),'onclick', this, 'handlePrevious');
 
                         MochiKit.Signal.connect(this.getElement('nextButton'),          'onclick', this, 'handleNext');
                         MochiKit.Signal.connect(this.getElement('smallNextButton'),     'onclick', this, 'handleNext');
                 
                 this.enablePrevious(false);
                 this.enableNext(false);
                 
         //      this.cursorMoved();
         },
 
         //.........................................................................
 
         'renderStepsComponents': function () {
                         varstepsFrame;
                 var dotsFrame;
         
                 stepsFrames = this.getElement('stepsFrame');
                 MochiKit.DOM.setElementClass(stepsFrames, 'steps');
                 MochiKit.DOM.addElementClass(stepsFrames, 'steps_' + this.steps().length);
                 
                 stepsFrames.innerHTML = "";
                 this.append(stepsFrames, {tag:'ul', id:this.getId('steps'), children:MochiKit.Base.map(
                         MochiKit.Base.bind(function (aStep) { return {tag:'li', children:[{tag:'span', html:this.translatedStepDescription(aStep)}]}}, this),
                         this.steps())}
                 );
 
                 dotsFrames = this.getElement('dotsFrame');
                 MochiKit.DOM.setElementClass(dotsFrames, 'dots');
                 MochiKit.DOM.addElementClass(dotsFrames, 'steps_' + this.steps().length);
 
                 dotsFrames.innerHTML = "";
                 this.append(dotsFrames, {tag:'ul', id:this.getId('dots'), children:MochiKit.Base.map(
                         function (aStep) { return {tag:'li', children:[{tag:'span', html:'*'}]}; },
                         this.steps())}
                 );
         },
 
         //-------------------------------------------------------------------------
 
         'handleExit': function (anEvent) {
                 anEvent.preventDefault();
                 
                 MochiKit.Signal.signal(this, 'exit');
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/TabSidePanel.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/TabSidePanel.js
index 666afe9..edcdb62 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/TabSidePanel.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/TabSidePanel.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.TabSidePanel = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.TabSidePanel.superclass.constructor.call(this, args);
 
         this._element = args.element || null;
 
         this._slots = {
         };
                 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.TabSidePanel, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.TabSidePanel component";
         },
 
         //-------------------------------------------------------------------------
 
         'deselectAllTabs': function() {
                 var tabListItems;
                 
                 tabListItems = [
                         'cardsLI',
         //              'directLoginLI',
                         'accountLI',
                         'dataLI',
                         'toolsLI'
                 ];
                 
 //Clipperz.log("=== TabSidePanel.tabSelected anEvent.src().id", anEvent.src().id);
                 for (var i in tabListItems) {
 //Clipperz.log("=== TabSidePanel.tabSelected aTabListItem", tabListItems[i]); 
                         MochiKit.DOM.removeElementClass(this.getId(tabListItems[i]), 'selected');
                 }
         },
         
         'selectTab': function(aTabName) {
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/TextColumnManager.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/TextColumnManager.js
index 3dc9ce9..9b1796a 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/TextColumnManager.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/TextColumnManager.js
@@ -1,50 +1,48 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 //#############################################################################
 
 Clipperz.PM.UI.Web.Components.TextColumnManager = function(args) {
         args = args || {};
         Clipperz.PM.UI.Web.Components.TextColumnManager.superclass.constructor.call(this, args);
         
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.TextColumnManager, Clipperz.PM.UI.Web.Components.ColumnManager, {
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.TextColumnManager component";
         },
         
         //-----------------------------------------------------
 
         '__syntax_fix__' : 'syntax fix'
         
 });
 
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ToolsPanel.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ToolsPanel.js
index 0fa369f..034ed91 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ToolsPanel.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/ToolsPanel.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.ToolsPanel = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.ToolsPanel.superclass.constructor.apply(this, arguments);
         
         this._initiallySelectedTab = args.selected || 'PASSWORD_GENERATOR';
         this._tabPanelControllerConfiguration = {
                 'PASSWORD_GENERATOR': {
                                 tab:'passwordGeneratorTab',
                                 panel:'passwordGeneratorPanel'
                 },
                 'BOOKMARKLET': {
                                 tab:'bookmarkletTab',
                                 panel:'bookmarkletPanel'
                 },
                 'COMPACT_EDITION': {
                                 tab:'compactEditionTab',
                                 panel:'compactEditionPanel'
                 },
                 'HTTP_AUTH': {
                                 tab:'httpAuthTab',
                                 panel:'httpAuthPanel'
                 }
         };
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.ToolsPanel, Clipperz.PM.UI.Common.Components.TabPanelComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.ToolsPanel component";
         },
 
         //-------------------------------------------------------------------------
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.append(this.element(), [
                         {tag:'div', cls:'header', children:[
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js
index 21ccf2a..fe46729 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.UnlockPasswordComponent = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.UnlockPasswordComponent.superclass.constructor.apply(this, arguments);
 
                 this._openFromElement                   = args.openFromElement          || null;
                 this._onOkCloseToElement                = args.onOkCloseToElement       || null;
                 this._onCancelCloseToElement    = args.onCancelCloseToElement|| null;
 
         this._progressBarComponent = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UnlockPasswordComponent, Clipperz.PM.UI.Common.Components.SimpleMessagePanel, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.UnlockPasswordComponent component";
         },
 
         //-------------------------------------------------------------------------
 
         'getPassphrase': function () {
         /*      var deferredResult;
 
                 if (this.passphrase() == null) {
                         this.deferredShowModal({'openFromElement': this.openFromElement()});
                         deferredResult = this.deferred();
                 } else {
                         deferredResult = MochiKit.Async.succeed(this.passphrase());
                 }
 
                 return deferredResult;
 */
 
                 this.deferredShowModal({'openFromElement': this.openFromElement()});
 
                 return this.deferred();
         },
@@ -115,67 +113,66 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UnlockPasswordComponent, Clip
         //-------------------------------------------------------------------------
 
         'showProgressBar': function () {
                         varprogressBarElement;
                 
                 this.getElement('container').innerHTML = '';
 
                 progressBarElement = this.append(this.getElement('container'), {tag:'div', cls:'progressBarWrapper'});
                 this.addComponent(new Clipperz.PM.UI.Common.Components.ProgressBar({'element':progressBarElement}));
                 
                 this.setButtons([{text:"Cancel", result:'CANCEL'}]);
         },
 
         //-------------------------------------------------------------------------
 
         'showFailure': function () {
                 this.setType('ALERT');
                 this.setTitle("Login failed");
                 this.setText("Wrong passphrase; the unlock has failed.");
                 this.getElement('container').innerHTML = '';
                 this.setButtons([{text:"Close", result:'CANCEL', isDefault:true}]);
         },
 
         //-------------------------------------------------------------------------
 
         'closeOk': function () {
                 var passphrase;
                 
                 passphrase = this.getElement('passphrase').value;
                 this.showProgressBar();
         //      this.deferred().callback(passphrase);
                 MochiKit.Async.callLater(0.5, MochiKit.Base.method(this.deferred(), 'callback', passphrase));
                 this._deferred = null;
         },
         
         'closeCancel': function () {
                 this.deferredHideModal({closeToElement:this.onCancelCloseToElement()});
                 this.deferred().cancel();
                 this._deferred = null;
         },
 
         //-------------------------------------------------------------------------
 
         'userSuccessfullyLoggedInHandler': function (anEvent) {
                 this.deferredHideModal({closeToElement:this.onOkCloseToElement()});
         },
         
         'userLoginFailedHandler': function (anEvent) {
-//console.log("############### FAILED LOGIN ################");
                 this.showFailure();
         },
 
         //-------------------------------------------------------------------------
 /*
         'deferredShow': function (someArgs, aResult) {
                 this.deferredShowModal(someArgs);
 
         //      this.deferred().addMethod(this, 'deferredHideModal', {closeToElement:someArgs.onOkCloseToElement });
         //      this.deferred().addErrback (MochiKit.Base.method(this, 'deferredHideModal', {closeToElement:someArgs.onCancelCloseToElement }));
         //      this.deferred().addCallback(MochiKit.Async.succeed, aResult);
 
                 return this.deferred();
         },
 */
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js
index d699dc6..fbf58e0 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js
@@ -1,197 +1,191 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 
 Clipperz.PM.UI.Web.Components.UserInfoBox = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Components.UserInfoBox.superclass.constructor.apply(this, arguments);
 
                 this._slots = {};
         this._isLocked = false;
         this._lockTooltip = null;
         
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UserInfoBox, Clipperz.PM.UI.Common.Components.BaseComponent, {
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return "Clipperz.PM.UI.Web.Components.UserInfoBox component";
         },
 
         //-------------------------------------------------------------------------
 
         'handleLogout': function(anEvent) {
 //Clipperz.log(">>> UserInfoBox.handleLogout");
                 anEvent.preventDefault();
                 MochiKit.Signal.signal(this, 'logout');
 //Clipperz.log("<<< UserInfoBox.handleLogout");
         },
 
         //-------------------------------------------------------------------------
 
         'lockTooltip': function () {
                 return this._lockTooltip;
         },
 
         //-------------------------------------------------------------------------
 
         'isLocked': function () {
                 return this._isLocked;
         },
         
         'setIsLocked': function (aValue) {
                 this._isLocked = aValue;
         },
 
         'toggleLock': function(anEvent) {
                 var deferredResult;
                 var shouldLock;
 
-//console.log(">>> UserInfoBox.toggleLock [locked: " + this.isLocked() + "]");
                 anEvent.preventDefault();
                 this.lockTooltip().hide();
 
                 shouldLock = (this.isLocked() == false);
 
                 if (shouldLock) {
                         var maskElement;
 
                         this.setIsLocked(true);
                         maskElement = this.getId('modalDialogMask');
                         deferredResult = Clipperz.Async.callbacks("UserInfoBox.toggleLock [lock]", [
                                 MochiKit.Base.partial(MochiKit.DOM.addElementClass, this.element(), 'locked'),
                                 MochiKit.Base.partial(Clipperz.Visual.deferredAnimation, MochiKit.Visual.appear, maskElement, {from:0.0, to:0.75, duration:0.5}),
                                 MochiKit.Base.method(Clipperz.PM.RunTime.mainController, 'setPassphraseDelegate', MochiKit.Base.method(this, 'askForPassphrase')),
                                 MochiKit.Base.partial(MochiKit.Signal.signal, this, 'lock')
                         ], {trace:false});
                 } else {
                         deferredResult = Clipperz.Async.callbacks("UserInfoBox.toggleLock [unlock]", [
                                 MochiKit.Base.partial(MochiKit.Signal.signal, this, 'unlock')
                         ], {trace:false});
                 }
-//console.log("<<< UserInfoBox.toggleLock");
                 
                 return deferredResult;
         },
 
         //-------------------------------------------------------------------------
 
         'unlock': function () {
                 var deferredResult;
                 var maskElement;
                 
                 this.setIsLocked(false);
                 maskElement = this.getId('modalDialogMask');
                 
                 deferredResult = Clipperz.Async.callbacks("UserInfoBox.unlock", [
                         MochiKit.Base.partial(Clipperz.Visual.deferredAnimation, MochiKit.Visual.fade, maskElement, {from:0.75, to:0.0, duration:0.5}),
         //              Clipperz.Visual.deferredAnimation(MochiKit.Visual.fade, maskElement, {from:0.75, to:0.0, duration:0.5}),
                         MochiKit.Base.partial(MochiKit.DOM.removeElementClass, this.element(), 'locked')
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'askForPassphrase': function () {
                         varunlockPasswordComponent;
 /*
                         vardeferredResult;
                 
                 deferredResult = new Clipperz.Async.Deferred("UserInfoBox.askForPassphrase", {trace:false});
                 deferredResult.addCallback(MochiKit.Async.succeed, 'test');
                 
                 deferredResult.callback();
                 
                 return deferredResult;
 */
-//console.log(">>> UserInfoBox.askForPassphrase");
                 unlockPasswordComponent = new Clipperz.PM.UI.Web.Components.UnlockPasswordComponent({
                                 'title':"Unlock account",
                                 'text':         "Insert the passprase to unlock the account",
                                 'type':         'INFO',
                         'buttons': [
                                         {text:"Cancel",result:'CANCEL'},
                                         {text:"Unlock",         result:'OK',isDefault:true}
                         ],
                                 'openFromElement':              this.getElement('lock'),
                                 'onOkCloseToElement':   null,
                                 'onCancelCloseToElement':this.getId('lock')
                 });
-//console.log("<<< UserInfoBox.askForPassphrase");
 
                 return unlockPasswordComponent.getPassphrase();
         },
 
         //=========================================================================
 
         'renderSelf': function(/*aContainer, aPosition*/) {
                 this.append(this.element(), [
         //              {tag:'canvas', id:this.getId('canvas'), cls:'canvas', width:'188', height:'154'},
                         {tag:'div', cls:'header', children:[
                                 {tag:'h1', html:"Welcome"},
                                 {tag:'a', cls:'lockButton', href:'#', id:this.getId('lock'), html:'&nbsp;'}
                         ]},
                         {tag:'div', cls:'body', children:[
                                 {tag:'h3', id:this.getId('username'), html:""},
                                 {tag:'ul', children:[
                                         {tag:'li', id:this.getId('cards'), children:[
                                                 {tag:'span', id:this.getId('cardsNumber'), cls:'number', html:"-"},
                                                 {tag:'span', id:this.getId('cardsLabel'), html:"cards"}
                                         ]},
                                         {tag:'li', id:this.getId('directLogins'), children:[
                                                 {tag:'span', id:this.getId('directLoginsNumber'), cls:'number', html:"-"},
                                                 {tag:'span', id:this.getId('directLoginsLabel'), html:"direct logins"}
                                         ]}
                                 ]},
                                 {tag:'a', href:'#', id:this.getId('logout'), html:"logout >"}
                         ]},
                         {tag:'div', cls:'footer'}
                 ]);
 
                 MochiKit.Signal.connect(this.getElement('logout'), 'onclick', this, 'handleLogout');
                 MochiKit.Signal.connect(this.getElement('lock'), 'onclick', this, 'toggleLock');
 
                 this._lockTooltip = new Clipperz.PM.UI.Common.Components.Tooltip({
                                 element:this.getElement('lock'),
                                 text:   "Click here to lock/unlock your account.",
                                 position:'RIGHT'
                 });
 
                 Clipperz.DOM.Helper.append(MochiKit.DOM.currentDocument().body,
                         {tag:'div', id:this.getId('modalDialogWrapper'), cls:'modalDialogWrapper', children:[
                                 {tag:'div', id:this.getId('modalDialogMask'), cls:'modalDialogMask userInfoBoxMask'}
                         ]}
                 );
                 MochiKit.Style.hideElement(this.getId('modalDialogMask'));
                 
         //      this.drawUserInfoBackground(this.getElement('canvas'));
         },
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js
index 1ab2e69..3d9d6d3 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/AppController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.AppController = function(args) {
 
         this._user = null;
         this._tabSlotNames = {
                         //tabName:       slotName
                         'cards':        'cardGrid',
         //              'directLogins':'directLoginGrid',
                         'account':      'accountPanel',
                         'data':                 'dataPanel',
                         'tools':        'toolsPanel'
         };
         
         //controllers
                 this._cardsController= null;
         //this._directLoginsController = null;
                 this._filterController  = null;                 //new Clipperz.PM.UI.Web.Controllers.FilterController();
         
         //components
         this._appPage = null;
         this._userInfoBox = null;
         this._tabSidePanel = null;
 
         //      MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'editCard',         this, 'handleEditCard');
         //      MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'deleteCard',this, 'handleDeleteCard');
 
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'userDataSuccessfullySaved',this, 'userDataSuccessfullySavedHandler');
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.AppController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.AppController";
         },
 
         //-----------------------------------------------------------------------------
         
         'setUser': function(anUser) {
                 this._user = anUser;
         },
         
         'user': function() {
@@ -279,73 +277,72 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.AppController.prototype, {
         //=============================================================================
 
         'handleAddCard': function (aSourceElement) {
 //Clipperz.log("=== AppController.addCard", aSourceElement);
                 this.cardsController().addCard(aSourceElement);
         },
 
         //=============================================================================
 
         'userDataSuccessfullySavedHandler': function (anEvent) {
                 this.populateUserInfo();
         },
 
         //=============================================================================
 
         'handleLogout': function(anEvent) {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("AppController.handleLogout", {trace:false});
                 deferredResult.addMethod(this.user(), 'logout');
                 deferredResult.addCallback(MochiKit.Signal.signal, this, 'logout');
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
         //-----------------------------------------------------------------------------
 
         'handleLock': function (anEvent) {
                 return Clipperz.Async.callbacks("AppController.handleLock", [
                         MochiKit.Base.method(this.cardsController(), 'deleteAllCleanTextData'),
                         MochiKit.Base.method(this.user(), 'lock')
                 ], {trace:false});
         },
 
         //.............................................................................
 
         'handleUnlock': function (anEvent) {
                 return Clipperz.Async.callbacks("AppController.handleUnock", [
                         MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'initProgress'),
                         MochiKit.Base.method(this.user(), 'login'),
                         MochiKit.Base.method(this.cardsController(), 'focus'),
                         MochiKit.Base.partial(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'progressDone'),
                         MochiKit.Base.method(this.userInfoBox(), 'unlock')
                 ], {trace:false});
         },
 
         'handleDownloadOfflineCopy': function (anEvent) {
-console.log("AppController.handleDownloadOfflineCopy");
                 var downloadHref;
                 
                 downloadHref = window.location.href.replace(/\/[^\/]*$/,'') + Clipperz_dumpUrl;
 
                 if (Clipperz_IEisBroken == true) {
                         window.open(downloadHref, "");
                 } else {
                                 vardeferredResult;
                         var newWindow;
 
                         newWindow = window.open("", "");
 
                         deferredResult = new Clipperz.Async.Deferred("AppController.handleDownloadOfflineCopy", {trace:true});
                         deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'echo', {'echo':"echo"});
                         deferredResult.addCallback(function(aWindow) {
                                 aWindow.location.href = downloadHref;
                         }, newWindow);
                         deferredResult.callback();
                 }
         },
 
         //=============================================================================
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardDialogController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardDialogController.js
index effde31..b1ff81f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardDialogController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardDialogController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.CardDialogController = function(args) {
         args = args || {};
         
         Clipperz.PM.UI.Web.Controllers.CardDialogController.superclass.constructor.call(this, args);
         
                 this._record    = args.record   || Clipperz.Base.exception.raise('MandatoryParameter');
                 this._delegate  = args.delegate         || Clipperz.Base.exception.raise('MandatoryParameter');
 
         this._referenceElement = null;
         this._cardDialogComponent = null;
 
         this._fieldsReferences = {};
         this._directLoginReferences = {};
 
         this._directLoginWizardController = null;
         this._directLoginEditingComponent = null;
         this._isDirectLoginEditingComponentVisible = false;
 
         return this;
 };
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Controllers.CardDialogController, Object, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.CardDialogController";
         },
 
         //-------------------------------------------------------------------------
 
         'record': function () {
                 return this._record;
         },
 
         'delegate': function () {
                 return this._delegate;
         },
 
         //-------------------------------------------------------------------------
 
         'fieldsReferences': function () {
                 return this._fieldsReferences;
         },
 
@@ -329,97 +327,96 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Controllers.CardDialogController, Object
                 
                 return deferredResult;
         },
         
         //-------------------------------------------------------------------------
 
         'updateRecordDirectLoginDetails': function (aDirectLogin) {
                 var result;
 
                 if (MochiKit.Base.isUndefinedOrNull(aDirectLogin)) {
                         result = MochiKit.Async.succeed();
                 } else {
                         result = Clipperz.Async.callbacks("CardDialogController.updateRecordDirectLoginDetails", [
                                 MochiKit.Base.method(this.directLoginEditingComponent(), 'label'),
                                 MochiKit.Base.method(aDirectLogin, 'setLabel'),
                                 MochiKit.Base.method(this.directLoginEditingComponent(), 'favicon'),
                                 MochiKit.Base.method(aDirectLogin, 'setFavicon')
                         ], {trace:false});
                 }
                 
                 return result;
         },
 
         //=========================================================================
 
         'addField': function () {
                 return this.record().addField({
                         'label':this.cardDialogComponent().newFieldLabel(),
                         'value':this.cardDialogComponent().newFieldValue(),
                         'isHidden':this.cardDialogComponent().newFieldIsHidden()
                 });
         },
 
         'handleAddField': function () {
                 return Clipperz.Async.callbacks("CardDialogController.handleAddField", [
                         MochiKit.Base.method(this, 'addField'),
 
                         MochiKit.Base.method(this, 'addCardDialogComponentWithField'),
                         MochiKit.Base.method(this.cardDialogComponent(), 'resetNewFieldInputs'),
 
                         MochiKit.Base.method(this.cardDialogComponent(), 'fixRendering'),
                         MochiKit.Base.method(this, 'handleChangedValue')
                 ], {trace:false})
         },
 
         //-------------------------------------------------------------------------
 
         'handlePerformFieldAction': function (aFieldID, aTargetElement) {
-//console.log("### targetElement", aTargetElement);
                 return Clipperz.Async.callbacks("CardDialogController.handleDeleteField", [
                         MochiKit.Base.method(this.record(), 'fields'),
                         MochiKit.Base.itemgetter(aFieldID),
                         Clipperz.Async.collectResults("CardDialogController.handleDeleteField <collect results>", {
                                         'value':MochiKit.Base.methodcaller('value'),
                                         'type':         MochiKit.Base.methodcaller('actionType')
                         }, {trace:false}),
                         MochiKit.Base.bind(function (someValues) {
                                 switch (someValues['type']) {
                                         case 'NONE':
                                                 throw "this event handler should not be triggered for fields with type 'NONE'";
                                                 break;
                                         case 'URL':
                                                 var url;
                                                 
                                                 url = someValues['value'];
                                                 if (/^https?\:\/\//.test(url) == false) {
                                                         url = 'http://' + url;
                                                 }
                                                 
                                                 window.open(url);
                                                 break;
                                         case 'EMAIL':
                                                 var url;
                                                 
                                                 url = 'mailto:' + someValues['value'];
                                                 
                                                 MochiKit.DOM.currentWindow().location = url;
                                                 break;
                                         case 'PASSWORD':
 //Clipperz.log("SHOW PASSWORD " + someValues['value']);
                                                 this.showPasswordTooltip(someValues['value'], aTargetElement);
                                                 break;
                                 }
                         }, this)
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'handleDeleteField': function (aFieldID) {
                 return Clipperz.Async.callbacks("CardDialogController.handleDeleteField", [
                         MochiKit.Base.method(this.record(), 'fields'),
                         MochiKit.Base.itemgetter(aFieldID),
                         MochiKit.Base.method(this.record(), 'removeField'),
 
                         MochiKit.Base.method(this, 'fieldsReferences'),
                         MochiKit.Base.itemgetter(aFieldID),
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardsController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardsController.js
index f58f0b8..68b5b9f 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardsController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/CardsController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.CardsController = function() {
         Clipperz.PM.UI.Web.Controllers.CardsController.superclass.constructor.apply(this, arguments);
 
         MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'cardDialogComponentClosed', this, 'handleHideCard');
 
         return this;
 }
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Controllers.CardsController, Clipperz.PM.UI.Web.Controllers.GridController, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.CardsController";
         },
 
         'createGrid': function () {
                 var grid;
                 
                 grid = new Clipperz.PM.UI.Web.Components.GridComponent({columnsManagers: [
                         new Clipperz.PM.UI.Web.Components.FaviconColumnManager({
                                         'name':                 'Cards.favicon',
                                         'selector':  MochiKit.Base.methodcaller('favicon'),
                                         'cssClass':     'favicon'
                         }),
                         new Clipperz.PM.UI.Web.Components.LinkColumnManager({
                                         'name':                 'Cards.title',
                                         'selector':      MochiKit.Base.methodcaller('label'),
                                         'label':        'title',
                                         'cssClass':     'title',
                                         'comparator': Clipperz.Base.caseInsensitiveCompare,
                                         'sortable':       true,
                                         'sorted':       'ASCENDING',
         //                              'actionMethod': function(anObject, anEvent) { MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'editCard', {objectData:anObject, element:anEvent.src()})}
                                         'actionMethod': MochiKit.Base.method(this, 'handleShowCard')
                         }),
                         new Clipperz.PM.UI.Web.Components.DirectLoginsColumnManager({
                                         'name':                 'Cards.directLogins',
                                         'selector':       MochiKit.Base.methodcaller('directLoginReferences'),
                                         'label':        'direct logins',
                                         'cssClass':     'directLogin'
                         }),
                         new Clipperz.PM.UI.Web.Components.DateColumnManager({
                                         'name':                 'Cards.latestUpdate',
                                         'selector':       MochiKit.Base.methodcaller('updateDate'),
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js
index c025a51..92ed6e3 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController = function(args) {
                 this._directLoginEditingComponent       = args.directLoginEditingComponent|| Clipperz.Base.exception.raise('MandatoryParameter');
                 this._cardLabel                                         = args.cardLabel                                || Clipperz.Base.exception.raise('MandatoryParameter');
 
                 MochiKit.Signal.connect(this._directLoginEditingComponent, 'changedValue',this, 'handleChangedValue');
                 MochiKit.Signal.connect(this._directLoginEditingComponent, 'moveForward',this, 'handleMoveForward');
                 MochiKit.Signal.connect(this._directLoginEditingComponent, 'keyPressed',this, 'handleDirectLoginEditingComponentKeyPressed');
 
         this._directLogin = null;
         this._directLoginHasJustBeenAdded = false;
         
         this._rulerComponent = null;
 
         this._steps = null;
         this._currentStepIndex = 0;
         this._isNextEnabled = false;
 
         this._recordFields = null;
         this._originalBindings = null;
 
         this._bindingComponents = [];
         this._formValueComponents = [];
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController";
         },
 
         //-------------------------------------------------------------------------
 
         'directLogin': function () {
                 return this._directLogin;
         },
 
         //-------------------------------------------------------------------------
 
         'directLoginHasJustBeenAdded': function () {
                 return this._directLoginHasJustBeenAdded;
         },
@@ -118,97 +116,96 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.
         'resetBindingComponents': function () {
                 this.directLoginEditingComponent().clearAllBindingsComponents();
                 this._bindingComponents = [];
         },
 
         //=============================================================================
 
         'formValueComponents': function () {
                 return this._formValueComponents;
         },
 
         'resetFormValueComponents': function () {
                 this.directLoginEditingComponent().clearAllFormValueComponents();
                 this._formValueComponents = [];
         },
 
         //=============================================================================
 
         'recordFields': function () {
                 return this._recordFields;
         },
         
         'setRecordFields': function (aValue) {
                 this._recordFields = aValue;
         },
 
         'recordFieldWithReference': function (aReference) {
                 var matchingValues;
                 var result;
 
                 matchingValues = MochiKit.Base.filter(function (aField) { return aField['reference'] == aReference; }, this.recordFields());
 
                 if (matchingValues.length == 0) {
                         result = null;
                 } else {
                         result = matchingValues[0];
                 }
                 
                 return result;
         },
 
         //-----------------------------------------------------------------------------
 
         'originalBindings': function () {
                 return this._originalBindings;
         },
         
         'setOriginalBindings': function (aValue) {
-//console.log("BINDINGS", aValue);
                 this._originalBindings = aValue;
         },
 
         //=============================================================================
 
         'rulerComponent': function () {
                 if (this._rulerComponent == null) {
                         this._rulerComponent = new Clipperz.PM.UI.Web.Components.RulerComponent({
                                 translationContext:'Wizards.DirectLoginWizard'
                         });
                         this._rulerComponent.render();
                         
                                 MochiKit.Signal.connect(this._rulerComponent, 'exit',           this, 'handleExit');
                                 MochiKit.Signal.connect(this._rulerComponent, 'done',           this, 'done');
                                 MochiKit.Signal.connect(this._rulerComponent, 'moveForward',this, 'handleMoveForward');
                                 MochiKit.Signal.connect(this._rulerComponent, 'moveBackward',this, 'handleMoveBackward');
                                 MochiKit.Signal.connect(this._rulerComponent, 'cursorMoved',this, 'handleCursorMoved');
                 }
                 
                 return this._rulerComponent;
         },
 
         //-----------------------------------------------------------------------------
 
         'showRuler': function (someSteps) {
                 var rulerElement;
 
                 this.setSteps(someSteps);
 
                 rulerElement = this.rulerComponent().element();
                 this.directLoginEditingComponent().disableAllPanels();
 
                 MochiKit.Style.showElement(rulerElement);
                 MochiKit.Style.setElementPosition(rulerElement, {x:-1000, y:this.directLoginEditingComponent().bottomMargin()});
                 new MochiKit.Visual.Move(rulerElement, {
                         x:0, y:this.directLoginEditingComponent().bottomMargin(),
                         mode:'absolute',
                         duration:1,
                         afterFinish:MochiKit.Base.method(this, 'handleCursorMoved')
                 });
         },
 
         'fixRulerRendering': function (aValue) {
                 this.rulerComponent().setDisplayMode(aValue);
         },
 
         //-----------------------------------------------------------------------------
 
@@ -362,98 +359,96 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.
                                 this.directLoginEditingComponent().focusOnFaviconElement();
                                 break;
                         case 'DONE':
                                 break;
                 }
         },
 
         //=============================================================================
 
         'steps': function () {
                 return this._steps;
         },
 
         'setSteps': function (aValue) {
                 this._steps = aValue;
 
                 this.rulerComponent().setSteps(aValue);
                 this.resetCurrentStepIndex();
         },
         
         'currentStepIndex': function () {
                 return this._currentStepIndex;
         },
         
         'currentStep': function () {
                 return this.steps()[this.currentStepIndex()];
         },
 
         //=============================================================================
 
         'handleExit': function () {
                 MochiKit.Signal.signal(this, 'exit');
         },
 
         'done': function () {
                 this.doneWithRuler();
 
                 Clipperz.Async.callbacks("DirectLoginWizardController.done", [
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'label'),
                         MochiKit.Base.method(this.directLogin(), 'setLabel'),
                         
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'bookmarkletConfiguration'),
                         MochiKit.Base.method(this.directLogin(), 'setBookmarkletConfiguration'),
 
                                 //Bindings
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'bindingComponents'),
         //              MochiKit.Base.partial(MochiKit.Base.map, MochiKit.Base.bind(function (aBindingComponent) {
                         Clipperz.Async.forEach(MochiKit.Base.bind(function (aBindingComponent) {
-//console.log("aBindingComponent", aBindingComponent);
-        //                      this.directLogin().
                                 return Clipperz.Async.callbacks("DirectLoginWizardController.done - update directLogin bindings", [
                                         MochiKit.Base.method(this.directLogin(), 'bindings'),
                                         MochiKit.Base.itemgetter(aBindingComponent.formFieldName()),
                                         MochiKit.Base.methodcaller('setFieldKey', aBindingComponent.selectedValue())
                                 ], {trace:false});
                         }, this)),
 
                         MochiKit.Base.method(this.directLoginEditingComponent(), 'favicon'),
                         MochiKit.Base.method(this.directLogin(), 'setFavicon'),
                         
                         MochiKit.Base.partial(MochiKit.Signal.signal, this, 'done', {
                                         'directLogin':  this.directLogin(),
                                         'hasJustBeenAdded':this.directLoginHasJustBeenAdded()
                         })
                 ], {trace:false});
         },
         
         //=============================================================================
 
         'handleMoveBackward': function () {
                 if (this._currentStepIndex > 0) {
                                 varafterMoveAction;
 
                         this._currentStepIndex --;
                         afterMoveAction = MochiKit.Base.noop;
 
                         switch(this.currentStep()) {
                                 case 'LABEL':
                                         break;
                                 case 'TYPE':
                                         break;
                                 case 'CONFIGURATION':
                                         break;
                                 case 'BINDINGS':
                                         break;
                                 case 'FAVICON':
                                         break;
                                 case 'DONE':
                                         break;
                         };
 
                         this.rulerComponent().moveBackward(afterMoveAction);
                 }
                 
                 if (this._currentStepIndex == 0) {
                         this.enablePrevious(false);
                 }
         },
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js
index 6ca3be4..7ab512a 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 /*
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.DirectLoginsController = function() {
         Clipperz.PM.UI.Web.Controllers.DirectLoginsController.superclass.constructor.apply(this, arguments);
         
         return this;
 };
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Controllers.DirectLoginsController, Clipperz.PM.UI.Web.Controllers.GridController, {
 
         'createGrid': function () {
                 return new Clipperz.PM.UI.Web.Components.GridComponent({columnsManagers: [
                         new Clipperz.PM.UI.Web.Components.FaviconColumnManager({
                                         'name':                 'DirectLogins.favicon',
                                         'selector':  MochiKit.Base.methodcaller('favicon'),
                                         'cssClass': 'favicon'
                         }),
         //              new Clipperz.PM.UI.Web.Components.LinkColumnManager({
                         new Clipperz.PM.UI.Web.Components.DirectLoginColumnManager({
                                         'name':                 'DirectLogins.title',
                                         'selector':      MochiKit.Base.methodcaller('label'),
                                         'label':        'title',
                                         'cssClass':     'title',
                                         'comparator':  Clipperz.Base.caseInsensitiveCompare,
                                         'sortable':      true,
                                         'sorted':       'ASCENDING',
                                         'actionMethod': MochiKit.Base.methodcaller('runDirectLogin')
                         }),
         //              new Clipperz.PM.UI.Web.Components.TextColumnManager({ //should be StrengthColumnManager
         //                              'label':'strength',
         //                              'cssClass':'title',
         //                              'selector': MochiKit.Base.methodcaller('label') //should be 'strength' or a strenght evaluation function
         //              }),
                         new Clipperz.PM.UI.Web.Components.LinkColumnManager({
                                         'name':                 'DirectLogins.cardTitle',
                                         'selector':      MochiKit.Base.compose(MochiKit.Base.methodcaller('label'), MochiKit.Base.methodcaller('record')),
                                         'label':        'card',
                                         'cssClass':     'cardTitle',
                                         'comparator':  Clipperz.Base.caseInsensitiveCompare,
                                         'sortable':      true,
                                         'sorted':       'UNSORTED',
                                         'actionMethod': MochiKit.Base.method(this, 'handleShowCard')
                         }),
         //              new Clipperz.PM.UI.Web.Components.TextColumnManager({ //should be StrengthColumnManager
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/FilterController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/FilterController.js
index bfc093a..de59ec3 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/FilterController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/FilterController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.FilterController = function(args) {
         args = args || {};
 
         Clipperz.PM.UI.Web.Controllers.FilterController.superclass.constructor.call(this, args);
 
         this._filterElements = [];
         this._filter = "";
         
         this._pendingSearchClicks = 0;
                 
         return this;
 };
 
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Controllers.FilterController, Object, {
 
         //-----------------------------------------------------------------------------
 
         'getFilter': function () {
                 return this._filter;
         },
 
         '_setFilter': function (aFilterElement, aFilter) {
                 if (aFilter != this._filter) {
                         this._filter = aFilter;
                         MochiKit.Signal.signal(this, 'filterUpdated', aFilter);
                         this.updateFilterElements(aFilterElement, aFilter);
                 }
         },
         
         'setFilter': function (aFilter) {
                 this._setFilter(null, aFilter);
         },
 
         //-----------------------------------------------------------------------------
 
         'filterElements': function () {
                 return this._filterElements;
         },
 
         'registerFilterElement': function (aFilterElement) {
 //Clipperz.log("=== FilterController.registerFilterElement", aFilterElement);
                 this._filterElements.push(aFilterElement);
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/GridController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/GridController.js
index 8bb3016..44fbdef 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/GridController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/GridController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.GridController = function(args) {
         args = args || {};
         
         Clipperz.PM.UI.Web.Controllers.GridController.superclass.constructor.call(this, args);
         
         this._grid = null;
         this._user = null;
         this._sortedColumnManager = null;
         this._cachedObjects = null;
         this._filterController = args.filterController || null;
 
         this._deferredDisplaySelectedRowsInvocation = null;
         
         return this;
 };
 
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Controllers.GridController, Object, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.GridController";
         },
 
         //-----------------------------------------------------------------------------
 
         'createGrid': function () {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         'setupWithGrid': function (aGrid) {
                 this._grid = aGrid;
                 
                 if (this._grid != null) {
                         MochiKit.Iter.forEach(this.columnsManagers(), function (aColumnManager) {
                                 if (aColumnManager.isSortable()) {
                                         if (aColumnManager.isSorted()) {
                                                 this.setSortedColumnManager(aColumnManager);
                                         }
                                         MochiKit.Signal.connect(aColumnManager, 'sort', this, 'handleColumnManagerSort');
                                 }
                                 MochiKit.Signal.connect(aColumnManager, 'selectRow', this, 'handleColumnManagerSelectRow');
                                 MochiKit.Signal.connect(aColumnManager, 'unselectRow', this, 'handleColumnManagerUnselectRow');
                         }, this);
                 }
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
index a57152d..ac85d36 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/LoginController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.LoginController = function(args) {
         this._args = args || {};
 
         this._loginPage = null;
 
         this._newUserWizardController = null;
         this._newUserCreationComponent = null;
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.LoginController";
         },
 
         'args': function () {
                 return this._args;
         },
 
         //-----------------------------------------------------------------------------
 
         'loginPage': function() {
                 if (this._loginPage == null) {
                         this._loginPage = new Clipperz.PM.UI.Web.Components.LoginPage();
                         
                         MochiKit.Signal.connect(this._loginPage, 'createNewAccountClick', this, 'handleCreateNewAccountClick')
                 }
                 
                 return this._loginPage;
         },
 
         //-----------------------------------------------------------------------------
 
         'run': function(args) {
                         varslot;
                         varloginPage;
                         varloginForm;
 
                 slot = args.slot;
 
                         loginForm =new Clipperz.PM.UI.Web.Components.LoginForm({'autocomplete': this.args()['autocomplete']});
@@ -167,84 +165,82 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
                         this._newUserCreationComponent = new Clipperz.PM.UI.Web.Components.NewUserCreationComponent();
                 }
                 
                 return this._newUserCreationComponent;
         },
 
         'clearNewUserCreationComponent': function () {
                 if (this._newUserCreationComponent != null) {
                         this._newUserCreationComponent.clear();
                 }
                 this._newUserCreationComponent = null;
         },
 
         //-------------------------------------------------------------------------
 
         'handleHideNewUserCreationComponent': function () {
                 this.clearNewUserCreationComponent();
         },
 
         'handleCompleteNewUserCreationComponent': function (someParameters) {
                         vardeferredResult;
                         varuser;
                         varnewUserCreationComponent;
 
                 user = someParameters.user;
                 newUserCreationComponent = this.newUserCreationComponent();
                         MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'CARDS_CONTROLLER_DID_RUN',MochiKit.Base.method(newUserCreationComponent, 'deferredHideModal', {closeToElement:MochiKit.DOM.currentDocument().body})),
 
                 deferredResult = new Clipperz.Async.Deferred("LoginController.handleCompleteNewUserCreationComponent", {trace:false});
 
                 deferredResult.addCallbackList([
                         MochiKit.Base.method(Clipperz.Crypto.PRNG.defaultRandomGenerator(), 'deferredEntropyCollection'),
                         MochiKit.Base.method(user, 'login'),
                         MochiKit.Base.method(this, 'userLoggedIn', user),
                         MochiKit.Base.method(this, 'clearNewUserCreationComponent')
                 ]);
                 deferredResult.addErrback(function (aValue) { Clipperz.log("WTF!! Error doing the login after creating a new user" + aValue)});
                 deferredResult.callback();
                 
                 return deferredResult;
         },
 
 
         //=========================================================================
 
         'handleFailedLogin': function(aLoginProgress, anError) {
                 var result;
 
-//console.log("anError", anError);
                 if (anError instanceof MochiKit.Async.CancelledError) {
                         result = anError;
                 } else {
                         var deferredResult;
                         
-MochiKit.Logging.logError("## MainController - FAILED LOGIN: " + anError);
+Clipperz.logError("## MainController - FAILED LOGIN: " + anError);
                         deferredResult = new MochiKit.Async.Deferred();
 
                         aLoginProgress.showErrorMessage("failed login");
         //              Clipperz.NotificationCenter.register(loginProgress, 'cancelEvent', deferredResult, 'callback');
                         MochiKit.Signal.connect(aLoginProgress, 'cancelEvent', deferredResult, 'callback');
                         deferredResult.addCallback(MochiKit.Async.fail, anError)
                         result = deferredResult;
                 }
         
                 return result;
         },
 
         'handleGenericError': function(anError) {
                 var result;
                 
                 if (anError instanceof MochiKit.Async.CancelledError) {
                         result = anError;
                 } else {
-MochiKit.Logging.logError("## MainController - GENERIC ERROR" + "\n" + "==>> " + anError + " <<==\n" + anError.stack);
-//console.log(anError);
+Clipperz.logError("## MainController - GENERIC ERROR" + "\n" + "==>> " + anError + " <<==\n" + anError.stack);
                         result = new MochiKit.Async.CancelledError(anError);
                 }
         
                 return result;
         },
 
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/MainController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/MainController.js
index c83e3c0..9194125 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/MainController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/MainController.js
@@ -1,70 +1,68 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.MainController = function(args) {
         this._args = args;
 
                 //controllers
                 this._loginController =null;
                 this._appController =null;
 
                 //components
         this._headerComponent = null;
                 this._pageComponent =null;
         this._footerComponent = null;
         
         this._passphraseDelegateLock = new MochiKit.Async.DeferredLock();
         this._passphraseDelegateLock.acquire();
 //Clipperz.log('MainController init _passphraseDelegateLock', this._passphraseDelegateLock);
         this._passphraseDelegate = null;
 
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'remoteRequestSent',        this, 'handleRemoteRequestSent');
                 MochiKit.Signal.connect(Clipperz.Signal.NotificationCenter, 'remoteRequestReceived',this, 'handleRemoteRequestReceived');
 
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.MainController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.MainController";
         },
 
         'args': function () {
                 return this._args;
         },
 
         //-----------------------------------------------------------------------------
 
         'headerComponent': function() {
                 if (this._headerComponent == null) {
                         this._headerComponent = new Clipperz.PM.UI.Web.Components.PageHeader();
                 }
                 
                 return this._headerComponent;
         },
 
@@ -130,86 +128,80 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.MainController.prototype, {
                 var deferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("MainController.getPassphrase", {trace:false});
 
                 deferredResult.acquireLock(this._passphraseDelegateLock);
                 deferredResult.addMethod(this, 'invokePassphraseDelegate');
                 deferredResult.releaseLock(this._passphraseDelegateLock);
                 deferredResult.callback();
         
                 return deferredResult;
         },
         
         //.........................................................................
         
         'invokePassphraseDelegate': function () {
                 return this._passphraseDelegate();
         },
 
         'passphraseDelegateLock': function () {
                 return this._passphraseDelegateLock;
         },
 
         //.........................................................................
 
         'setPassphraseDelegate': function (aDelegate) {
                 var shouldReleaseLock;
 
                 shouldReleaseLock = (this._passphraseDelegate == null);
 
                 this._passphraseDelegate = aDelegate;
 
                 if (shouldReleaseLock) {
                         this._passphraseDelegateLock.release();
                 }
         },
         
         //.........................................................................
 
         'removePassphraseDelegate': function (aDelegate) {
                 if (this._passphraseDelegate == aDelegate) {
                         this._passphraseDelegate = null;
                         this._passphraseDelegateLock.acquire();
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'loginControllerUserLoggedInCallback': function(anEvent) {
-//Clipperz.log(">>> loginControllerUserLoggedInCallback", anEvent);
-        //      this.setUser(anEvent.parameters()['user']);
-//console.log("--- loginControllerUserLoggedInCallback - 1");
-
-//console.log("--- loginControllerUserLoggedInCallback - 2");
                 this.headerComponent().switchToLoggedMode();
                 this.appController().run({slot:this.pageComponent().slotNamed('body'), user:anEvent['user']});
-//Clipperz.log("<<< loginControllerUserLoggedInCallback");
         },
 
         //-----------------------------------------------------------------------------
 
         'handleRemoteRequestSent': function () {
 //Clipperz.log("REMOTE REQUEST sent >>>");
         },
 
         'handleRemoteRequestReceived': function () {
 //Clipperz.log("REMOTE REQUEST received <<<");
         },
 
         //-----------------------------------------------------------------------------
 
         'handleLogout': function(anEvent) {
                 this.exit('logout.html');
         },
 
         //-----------------------------------------------------------------------------
 
         'exit': function(aPageName) {
 //Clipperz.log("### exit " + aPageName);
                 MochiKit.Async.wait(0).addCallback(function() {
                         window.location.href = "./" + aPageName + "?ln=" + Clipperz.PM.Strings.selectedLanguage;
                 });
         },
 
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js
index 7db6888..b70aa17 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js
@@ -1,123 +1,120 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 Clipperz.Base.module('Clipperz.PM.UI.Web.Controllers');
 
 Clipperz.PM.UI.Web.Controllers.NewUserWizardController = function(args) {
                 this._newUserCreationComponent  = args.newUserCreationComponent|| Clipperz.Base.exception.raise('MandatoryParameter');
 
                 MochiKit.Signal.connect(this._newUserCreationComponent, 'changedValue',this, 'handleChangedValue');
                 MochiKit.Signal.connect(this._newUserCreationComponent, 'moveForward',this, 'handleMoveForward');
                 MochiKit.Signal.connect(this._newUserCreationComponent, 'keyPressed',this, 'handleNewUserCreationComponentKeyPressed');
 
         this._rulerComponent = null;
 
         this._steps = null;
         this._currentStepIndex = 0;
         this._isNextEnabled = false;
 
                 this._userCreationState = 'IDLE';       //'IN PROGRESS', 'DONE', 'FAILED'
         this._user = null;
         return this;
 }
 
 MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prototype, {
 
         'toString': function() {
                 return "Clipperz.PM.UI.Web.Controllers.NewUserWizardController";
         },
 
         //-------------------------------------------------------------------------
 
         'newUserCreationComponent': function () {
                 return this._newUserCreationComponent;
         },
 
         //=============================================================================
 
         'user': function () {
                 return this._user;
         },
         
         'setUser': function (aValue) {
                 this._user = aValue;
         },
 
         //-----------------------------------------------------------------------------
 
         'userCreationState': function () {
                 return this._userCreationState;
         },
         
         'setUserCreationState': function (aValue) {
-//console.log("+++ NewUserWizardController.setUserCreationState", aValue);
                 this._userCreationState = aValue;
                 this.checkState();
         },
 
         //=============================================================================
 
         'resetCurrentStepIndex': function () {
                 this._currentStepIndex = 0;
                 this.rulerComponent().resetStatus({animateTransition:true});
         },
 
         //-----------------------------------------------------------------------------
 
         'enableNext': function (aValue) {
                 this.rulerComponent().enableNext(aValue);
                 this._isNextEnabled = aValue;
         },
         
         'isNextEnabled': function () {
                 return this._isNextEnabled;
         },
         
         //-----------------------------------------------------------------------------
 
         'enablePrevious': function (aValue) {
                 this.rulerComponent().enablePrevious(aValue);
         },
         
         //=============================================================================
 
         'rulerComponent': function () {
                 if (this._rulerComponent == null) {
                         this._rulerComponent = new Clipperz.PM.UI.Web.Components.RulerComponent({
                                 translationContext:'Wizards.NewUserWizard'
                         });
                         this._rulerComponent.render();
                         
                                 MochiKit.Signal.connect(this._rulerComponent, 'exit',           this, 'handleExit');
                                 MochiKit.Signal.connect(this._rulerComponent, 'done',           this, 'done');
                                 MochiKit.Signal.connect(this._rulerComponent, 'moveForward',this, 'handleMoveForward');
                                 MochiKit.Signal.connect(this._rulerComponent, 'moveBackward',this, 'handleMoveBackward');
                                 MochiKit.Signal.connect(this._rulerComponent, 'cursorMoved',this, 'handleCursorMoved');
                 }
                 
                 return this._rulerComponent;
         },
 
         'resetRuler': function () {
@@ -177,106 +174,103 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
         },
 
         //=============================================================================
 
         'createNewUserRulerSteps': function () {
                 return [ 'CREDENTIALS', 'CHECK_CREDENTIALS', 'TERMS_OF_SERVICE', 'CREATE_USER'/*, 'LOGIN' */];
         },
 
         //-------------------------------------------------------------------------
 
         'run': function () {
                 return Clipperz.Async.callbacks("NewUserWizardController.run", [
                         MochiKit.Base.method(this, 'createNewUserRulerSteps'),
                         MochiKit.Base.method(this, 'showRuler')
                 ], {trace:false});
         },
 
         //-----------------------------------------------------------------------------
         
         'checkState': function () {
                 var enablePrevious;
                 var enableNext;
 
                 enablePrevious = true;
                 enableNext = false;
 
                 this.newUserCreationComponent().disableAllPanels();
 
                 switch(this.currentStep()) {
                         case 'CREDENTIALS':
                                 this.newUserCreationComponent().enableCredentialsPanel();
 
                                 enableNext = (
                                         (this.newUserCreationComponent().username() != '')
                                         &&
                                         (this.newUserCreationComponent().passphrase() != '')
                                 );
         //                      enablePrevious = false;
                                 break;
                         case 'CHECK_CREDENTIALS':
                                 this.newUserCreationComponent().enableCheckCredentialsPanel();
 
                                 enableNext = (this.newUserCreationComponent().passphrase() == this.newUserCreationComponent().rePassphrase());
         //                      enablePrevious = true;
                                 break
                         case 'TERMS_OF_SERVICE':
                                 this.newUserCreationComponent().enableTermsOfServicePanel();
 
-//console.log("awareOfUnrecoverablePassphrase", this.newUserCreationComponent().awareOfUnrecoverablePassphrase());
-//console.log("readTermsOfService", this.newUserCreationComponent().readTermsOfService());
                                 enableNext = (
                                         (this.newUserCreationComponent().awareOfUnrecoverablePassphrase() == 'on')
                                         &&
                                         (this.newUserCreationComponent().readTermsOfService() == 'on')
                                 )
                                 break;
                         case 'CREATE_USER':
-//console.log(">>> CREATE_USER", this.userCreationState());
                                 this.newUserCreationComponent().enableCreateUserPanel();
 
                                 switch (this.userCreationState()) {
                                         case 'IDLE':
                                                 this.setUserCreationState('IN PROGRESS');
                                                 this.preformActualUserRegistration();
 
                                                 enablePrevious = false;
                                                 enableNext = false;
                                                 break;
                                         case 'IN PROGRESS':
                                                 enablePrevious = false;
                                                 enableNext = false;
                                                 break;
                                         case 'DONE':
                                                 enablePrevious = false;
                                                 enableNext = true;
                                                 break;
                                         case 'FAILED':
                                                 enablePrevious = true;
                                                 enableNext = false;
                                                 break;
                                 };
                                 break;
         //              case 'LOGIN':
         //                      this.newUserCreationComponent().enableLoginPanel();
         //                      break;
                 }
 
                 if (this.currentStepIndex() > 0) {
                         this.enablePrevious(enablePrevious);
                 } else {
                         this.enablePrevious(false);
                 }
                 this.enableNext(enableNext);
         },
 
         //-----------------------------------------------------------------------------
 
         'setFocus': function () {
                 switch(this.currentStep()) {
                         case 'CREDENTIALS':
                                 this.newUserCreationComponent().focusOnUsernameElement();
                                 break;
                         case 'CHECK_CREDENTIALS':
                                 this.newUserCreationComponent().focusOnRePassphraseElement();
                                 break
                         case 'TERMS_OF_SERVICE':
@@ -292,166 +286,164 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
 
         'steps': function () {
                 return this._steps;
         },
 
         'setSteps': function (aValue) {
                 this._steps = aValue;
 
                 this.rulerComponent().setSteps(aValue);
                 this.resetCurrentStepIndex();
         },
         
         'currentStepIndex': function () {
                 return this._currentStepIndex;
         },
         
         'currentStep': function () {
                 return this.steps()[this.currentStepIndex()];
         },
 
         //=============================================================================
 
         'handleExit': function () {
                 return Clipperz.Async.callbacks("NewUserWizardController.handleExit", [
         //              MochiKit.Base.method(this.newUserCreationComponent(), 'resetContent'),
                         Clipperz.Async.forkAndJoin("NewUserWizardController.handleExit - fork and join", [
                                 MochiKit.Base.method(this, 'hideRuler'),
                                 MochiKit.Base.method(this.newUserCreationComponent(), 'deferredHideModal')
                         ], {trace:false}),
                         MochiKit.Base.method(this, 'resetRuler'),
         //              MochiKit.Base.method(this.newUserCreationComponent(), 'reset'),
                         MochiKit.Base.partial(MochiKit.Signal.signal, this, 'exit')
                 ], {trace:false})
         },
 
         'done': function () {
                 this.doneWithRuler();
                 MochiKit.Signal.signal(this, 'done', {'user': this.user()});
         },
         
         //=============================================================================
 
         'handleMoveBackward': function () {
                 if (this._currentStepIndex > 0) {
                                 varafterMoveAction;
 
                         afterMoveAction = MochiKit.Base.noop;
 
-//console.log("<-- backward", this.currentStep());
                         switch(this.currentStep()) {
                                 case 'CREDENTIALS':
                                 case 'CHECK_CREDENTIALS':
                                 case 'TERMS_OF_SERVICE':
                                         this._currentStepIndex --;
                                         this.rulerComponent().moveBackward(afterMoveAction);
                                         break;
                                 case 'CREATE_USER':
                                         this.setUser(null);
                                         this.newUserCreationComponent().hideAllProgeressStates();
                                         this.resetCurrentStepIndex();
                                         this.setUserCreationState('IDLE');
                                         break;
         //                      case 'LOGIN':
         //                              break;
                         };
 
                 }
                 
                 if (this._currentStepIndex == 0) {
                         this.enablePrevious(false);
                 }
         },
 
         'handleMoveForward': function () {
                 if (this.isNextEnabled()) {
                                 varafterMoveAction;
 
                         this._currentStepIndex ++;
                         afterMoveAction = MochiKit.Base.noop;
 
                         switch(this.currentStep()) {
                                 case 'CREDENTIALS':
                                         break;
                                 case 'CHECK_CREDENTIALS':
                                         break
                                 case 'TERMS_OF_SERVICE':
                                         break;
                                 case 'CREATE_USER':
                                         break;
         //                      case 'LOGIN':
         //                              break;
                         };
 
                         this.rulerComponent().moveForward(afterMoveAction);
                 };
         },
 
         'handleCursorMoved': function () {
         //      this.checkState();
         //      this.setFocus();
                 
                 return Clipperz.Async.callbacks("NewUserWizardController.handleCursorMoved", [
                         MochiKit.Base.method(this.newUserCreationComponent(), 'waitUntilFullyRendered'),
                         MochiKit.Base.method(this, 'checkState'),
                         MochiKit.Base.method(this, 'setFocus')
                 ], {trace:false});
         },
 
         //-------------------------------------------------------------------------
 
         'handleChangedValue': function (anEvent) {
                 this.checkState();
         },
 
         //-------------------------------------------------------------------------
 
         'handleNewUserCreationComponentKeyPressed': function (anEvent) {
-//console.log(">>> handleNewUserCreationComponentKeyPressed", anEvent.key().string);
                 if (anEvent.key().string == 'KEY_ENTER') {
                         if (anEvent.target().nodeName != 'TEXTAREA') {
                                 anEvent.preventDefault();
                                 this.handleMoveForward();
                         }
                 } else if (anEvent.key().string == 'KEY_TAB') {
                         if (anEvent.target() == this.newUserCreationComponent().usernameElement()) {
                         } else {
                                 this.handleMoveForward();
                                 if ((anEvent.target().nodeName == 'INPUT') || (anEvent.target().nodeName == 'TEXTAREA')) {
                                         anEvent.preventDefault();
                                 }
                         }
                 } else if ((anEvent.key().string == 'KEY_ARROW_RIGHT') && (anEvent.modifier().meta == true)) {
                         this.handleMoveForward();
                 } else if ((anEvent.key().string == 'KEY_ARROW_LEFT') && (anEvent.modifier().meta == true)) {
                         this.handleMoveBackward();
                 } else if (anEvent.key().string == 'KEY_ESCAPE') {
                         anEvent.stop();
                         this.handleExit();
                 } else {
                         MochiKit.Async.callLater(0.1, MochiKit.Base.method(this, 'checkState'));
                 }
         },
 
         //=============================================================================
 
         'preformActualUserRegistration': function () {
                         vardeferredResult;
 
                 deferredResult = new Clipperz.Async.Deferred("NewUSerWizardController.preformActualUserRegistration", {trace:false});
                 deferredResult.addMethod(this.newUserCreationComponent(), 'showProgressOnUserCreation');
                 deferredResult.addMethod(Clipperz.PM.RunTime.mainController, 'setPassphraseDelegate', MochiKit.Base.method(this.newUserCreationComponent(), 'passphrase'));
                 deferredResult.addCallback(Clipperz.PM.DataModel.User.registerNewAccount,
                         this.newUserCreationComponent().username(),
                         MochiKit.Base.method(Clipperz.PM.RunTime.mainController, 'getPassphrase')
                 );
                 deferredResult.addMethod(this, 'setUser');
                 deferredResult.addMethod(this.newUserCreationComponent(), 'showUserCreationDone');
                 deferredResult.addMethod(this, 'setUserCreationState', 'DONE');
                 
         //      deferredResult.addErrback(MochiKit.Base.method(this.newUserCreationComponent(), 'showUserCreationFailed'));
         //      deferredResult.addErrback(MochiKit.Base.method(this, 'setUser', null));
         //      deferredResult.addErrback(MochiKit.Base.method(this, 'setUserCreationState', 'FAILED'));
                 deferredResult.addErrback(MochiKit.Base.bind(function (aValue) {
                         this.newUserCreationComponent().showUserCreationFailed();
                         this.setUser(null);
                         this.setUserCreationState('FAILED');