Updated Copyright claims

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

138 files changed, 1512 insertions, 2169 deletions

diff --git a/frontend/gamma/js/Clipperz/Async.js b/frontend/gamma/js/Clipperz/Async.js
index f7a9517..d525453 100644
--- a/frontend/gamma/js/Clipperz/Async.js
+++ b/frontend/gamma/js/Clipperz/Async.js
@@ -1,150 +1,141 @@
 /*
 
-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.Async = MochiKit.Async;
 
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.Async) == 'undefined') { Clipperz.Async = {}; }
 
 Clipperz.Async.VERSION = "0.1";
 Clipperz.Async.NAME = "Clipperz.Async";
 
 Clipperz.Async.Deferred = function(aName, args) {
         args = args || {};
 
         Clipperz.Async.Deferred.superclass.constructor.call(this, args.canceller);
 
         this._args = args;
         this._name = aName || "Anonymous deferred";
         this._count = 0;
         this._shouldTrace = ((CLIPPERZ_DEFERRED_TRACING_ENABLED === true) || (args.trace === true));
         this._vars = null;
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.Base.extend(Clipperz.Async.Deferred, MochiKit.Async.Deferred, {
 
         'name': function () {
                 return this._name;
         },
 
         'args': function () {
                 return this._args;
         },
 
         //-----------------------------------------------------------------------------
 
         'callback': function (aValue) {
                 if (this._shouldTrace) {
-                        //Clipperz.log("CALLBACK " + this._name, aValue);
-                        console.log("CALLBACK " + this._name, aValue);
+                        Clipperz.log("CALLBACK " + this._name, aValue);
                 }
 
                 if (this.chained == false) {
                         var message;
                         
                         message = "ERROR [" + this._name + "]";
                         this.addErrback(function(aResult) {
                                 if (! (aResult instanceof MochiKit.Async.CancelledError)) {
                                         Clipperz.log(message, aResult);
                                 }
                                 return aResult;
                         });
 
                         if (this._shouldTrace) {
                                 var resultMessage;
 
                                 resultMessage = "RESULT   " + this._name + " <==";
         //                      this.addCallback(function(aResult) {
                                 Clipperz.Async.Deferred.superclass.addCallback.call(this, function(aResult) {
-                                        //Clipperz.log(resultMessage, aResult);
-                                        console.log(resultMessage, aResult);
-
+                                        Clipperz.log(resultMessage, aResult);
                                         return aResult;
                                 });
                         }
                 }
 
                 if (CLIPPERZ_DEFERRED_CALL_LOGGING_ENABLED === true) {
                         Clipperz.log("callback " + this._name, this);
                 }
 
                 return Clipperz.Async.Deferred.superclass.callback.apply(this, arguments);
         },
 
         //-----------------------------------------------------------------------------
 
         'addCallback': function () {
                 var message;
                 
                 if (this._shouldTrace) {
                         this._count ++;
                         message = "[" + this._count + "] " + this._name + " ";
         //              this.addBoth(function(aResult) {Clipperz.log(message + "-->", aResult); return aResult;});
                         this.addCallbacks(
-                                //function(aResult) {Clipperz.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
-                                function(aResult) {console.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
-                                //function(aResult) {Clipperz.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
-                                function(aResult) {console.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
+                                function(aResult) {Clipperz.log("-OK- " + message + "-->"/*, aResult*/); return aResult;},
+                                function(aResult) {Clipperz.log("FAIL " + message + "-->"/*, aResult*/); return aResult;}
                         );
                 }
 
                 Clipperz.Async.Deferred.superclass.addCallback.apply(this, arguments);
 
                 if (this._shouldTrace) {
         //              this.addBoth(function(aResult) {Clipperz.log(message + "<--", aResult); return aResult;});
                         this.addCallbacks(
-                                //function(aResult) {Clipperz.log("-OK- " + message + "<--", aResult); return aResult;},
-                                function(aResult) {console.log("-OK- " + message + "<--", aResult); return aResult;},
-                                //function(aResult) {Clipperz.log("FAIL " + message + "<--", aResult); return aResult;}
-                                function(aResult) {console.log("FAIL " + message + "<--", aResult); return aResult;}
+                                function(aResult) {Clipperz.log("-OK- " + message + "<--", aResult); return aResult;},
+                                function(aResult) {Clipperz.log("FAIL " + message + "<--", aResult); return aResult;}
                         );
                 }
         },
 
         //=============================================================================
 
         'addCallbackPass': function() {
                 var passFunction;
 
                 passFunction = MochiKit.Base.partial.apply(null, arguments);
 
                 this.addCallback(function() {
                         var result;
 
                         result = arguments[arguments.length -1];
                         passFunction();
 
                         return result;
                 });
         },
 
         //-----------------------------------------------------------------------------
 
         'addErrbackPass': function() {
@@ -191,74 +182,73 @@ Clipperz.Base.extend(Clipperz.Async.Deferred, MochiKit.Async.Deferred, {
                                 deferredResult = Clipperz.Async.callbacks(this._name + " <else>", anElseBlock, null, aValue);
                         }
                         
                         return deferredResult;
                 }))
         },
 
         //-----------------------------------------------------------------------------
 
         'addMethod': function () {
                 this.addCallback(MochiKit.Base.method.apply(this, arguments));
         },
 
         //-----------------------------------------------------------------------------
 
         'addMethodcaller': function () {
                 this.addCallback(MochiKit.Base.methodcaller.apply(this, arguments));
         },
 
         //=============================================================================
 
         'addLog': function (aLog) {
                 if (CLIPPERZ_DEFERRED_LOGGING_ENABLED) {
                         this.addBothPass(function(res) {Clipperz.log(aLog + " ", res);});
-        //              this.addBothPass(function(res) {console.log(aLog + " ", res);});
                 }
         },
 
         //=============================================================================
         
         'acquireLock': function (aLock) {
         //      this.addCallback(function (aResult) {
         //              return Clipperz.Async.callbacks("Clipperz.Async.acquireLock", [
         //                      MochiKit.Base.method(aLock, 'acquire'),
         //                      MochiKit.Base.partial(MochiKit.Async.succeed, aResult)
         //              ], {trace:false});
         //      });
 
                 this.addCallback(MochiKit.Base.method(aLock, 'acquire'));
         },
 
         'releaseLock': function (aLock) {
         //      this.addCallback(function (aResult) {
         //              return Clipperz.Async.callbacks("Clipperz.Async.release <ok>", [
         //                      MochiKit.Base.method(aLock, 'release'),
         //                      MochiKit.Base.partial(MochiKit.Async.succeed, aResult)
         //              ], {trace:false});
         //      });
         //      this.addErrback(function (aResult) {
-///console.log("releaseLock.addErrback:", aResult);
+///Clipperz.log("releaseLock.addErrback:", aResult);
         //              return Clipperz.Async.callbacks("Clipperz.Async.release <fail>", [
         //                      MochiKit.Base.method(aLock, 'release'),
         //                      MochiKit.Base.partial(MochiKit.Async.fail, aResult)
         //              ], {trace:false});
         //      });
                 
         //      this.addBothPass(MochiKit.Base.method(aLock, 'release'));
                 this.addCallbackPass(MochiKit.Base.method(aLock, 'release'));
                 this.addErrback(function (anError) {
                         aLock.release();
 
                         return anError;
                 });
         },
 
         //=============================================================================
 
         'collectResults': function (someRequests) {
                 this.addCallback(Clipperz.Async.collectResults(this._name + " <collect results>", someRequests, this._args));
         },
 
         'addCallbackList': function (aRequestList) {
                 this.addCallback(Clipperz.Async.callbacks, this._name + " <callback list>", aRequestList, this._args);
         },
@@ -356,49 +346,49 @@ MochiKit.Base.update(Clipperz.Async.DeferredSynchronizer.prototype, {
 
         'numberOfMethodsDone':function() {
                 return this._numberOfMethodsDone;
         },
 
         'incrementNumberOfMethodsDone': function() {
                 this._numberOfMethodsDone ++;
         },
 
         //-----------------------------------------------------------------------------
         
         'run': function(args, aValue) {
                 var deferredResults;
                 var i, c;
                 
                 deferredResults = [];
                 args = args || {};
 
                 c = this.methods().length;
                 for (i=0; i<c; i++) {
                         var deferredResult;
                                 varmethodCalls;
                         var ii, cc;
 
-//console.log("TYPEOF", typeof(this.methods()[i]));
+//Clipperz.log("TYPEOF", typeof(this.methods()[i]));
                         if (typeof(this.methods()[i]) == 'function') {
                                 methodCalls = [ this.methods()[i] ];
                         } else {
                                 methodCalls = this.methods()[i];
                         }
                         
                         cc = methodCalls.length;
                         deferredResult = new Clipperz.Async.Deferred("Clipperz.Async.DeferredSynchronizer.run => " + this.name() + "[" + i + "]", args);
                         for (ii=0; ii<cc; ii++) {
                                 deferredResult.addCallback(methodCalls[ii]);
                         }
                         deferredResult.addBoth(MochiKit.Base.method(this, 'handleMethodCallDone', i));
 
                         deferredResults.push(deferredResult);
                 }
                 
                 for (i=0; i<c; i++) {
                         deferredResults[i].callback(aValue);
                 }
                 
                 return this.result();
         },
         
         //-----------------------------------------------------------------------------
@@ -616,49 +606,49 @@ MochiKit.Base.update(Clipperz.Async, {
                                 }, aDeferredComparator, anObject, aSortedResult[i], i);
                         }
                         deferredResult.addMethod(aSortedResult, 'push', anObject);
                         deferredResult.addErrback(function (anError) {
                                 aSortedResult.splice(anError.message, 0, anObject);
                         })
                         deferredResult.addBoth(MochiKit.Async.succeed, aSortedResult);
                         deferredResult.callback();
                 }
                 
                 return deferredResult;
         },
         
         //-------------------------------------------------------------------------
 
         'deferredSort': function (aDeferredComparator, someObjects) {
                 var deferredResult;
                 var i, c;
                                 
                 deferredResult = new Clipperz.Async.Deferred("Clipperz.Async.deferredSort", {trace:false});
                 c = someObjects.length;
                 for (i=0; i<c; i++) {
                         deferredResult.addCallback(Clipperz.Async.insertIntoSortedArray, someObjects[i], aDeferredComparator);
                         if ((i % 50) == 0) {
-        //console.log("######### sort wait ##########");
+        //Clipperz.log("######### sort wait ##########");
                                 deferredResult.addCallback(MochiKit.Async.wait, 0.5);
                         }
                         }       
                 deferredResult.callback([]);
 
                 return deferredResult;
         },
 
         //=========================================================================
 
         'deferredFilter': function (aFunction, someObjects) {
                         vardeferredResult;
                         vari, c;
 
                 deferredResult = new Clipperz.Async.Deferred("Clipperz.Async.deferredFilter", {trace:false});
                 c = someObjects.length;
                 for (i=0; i<c; i++) {
                         deferredResult.addCallback(function (aFunction, anObject, anIndex, aResult) {
                                 var innerDeferredResult;
                                 
                                 innerDeferredResult = new Clipperz.Async.Deferred("Clipperz.Async.deferredFilter <inner - " + anIndex + ">", {trace:false});
                                 innerDeferredResult.addCallback(aFunction, anObject);
                                 innerDeferredResult.addCallback(function (aFilterResult) {
                                         if (aFilterResult) {
@@ -667,45 +657,45 @@ MochiKit.Base.update(Clipperz.Async, {
                                 });
                                 innerDeferredResult.addBoth(MochiKit.Async.succeed, aResult);
                                 innerDeferredResult.callback();
 
                                 return innerDeferredResult;
                         }, aFunction, someObjects[i], i);
                 }
                 deferredResult.callback([]);
                 
                 return deferredResult;
         },
         
         'forEach': function (aFunction) {
                 return MochiKit.Base.partial(function (aFunction, anIterable) {
                         MochiKit.Iter.forEach(anIterable, aFunction);
                 }, aFunction);
         },
 
         //=========================================================================
 
         'or': function (someValues) {
                 return Clipperz.Async.callbacks("Clipperz.Async.or", [
                         MochiKit.Base.values,
                         MochiKit.Base.flattenArguments,
-//function (aValue) { console.log("Record.hasAnyCleanTextData - flatten", aValue); return aValue; },
+//function (aValue) { Clipperz.log("Record.hasAnyCleanTextData - flatten", aValue); return aValue; },
                         function(someInnerValues) {
                                 return MochiKit.Iter.some(someInnerValues, MochiKit.Base.operator.identity);
                         }
                 ], {trace:false}, someValues);
         },
 
         //=========================================================================
 
         'clearResult': function () {},
         
         //=========================================================================
         __syntaxFix__: "syntax fix"
 });
 
 
 //#############################################################################
 
 CLIPPERZ_DEFERRED_LOGGING_ENABLED = true;
 CLIPPERZ_DEFERRED_TRACING_ENABLED = false;
 CLIPPERZ_DEFERRED_CALL_LOGGING_ENABLED = false;
diff --git a/frontend/gamma/js/Clipperz/Base.js b/frontend/gamma/js/Clipperz/Base.js
index 9d399d9..84b2172 100644
--- a/frontend/gamma/js/Clipperz/Base.js
+++ b/frontend/gamma/js/Clipperz/Base.js
@@ -1,46 +1,44 @@
 /*
 
-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.Base) == 'undefined') { Clipperz.Base = {}; }
 
 Clipperz.Base.VERSION = "0.2";
 Clipperz.Base.NAME = "Clipperz.Base";
 
 MochiKit.Base.update(Clipperz.Base, {
 
         //-------------------------------------------------------------------------
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
@@ -420,114 +418,97 @@ MochiKit.Base.update(Clipperz.Base, {
 
         'sanitizeString': function(aValue) {
                 var result;
                 
                 if (Clipperz.Base.objectType(aValue) == 'string') {
                         result = aValue;
                         result = result.replace(/</img,"&lt;");
                         result = result.replace(/>/img,"&gt;");
                 } else {
                         result = aValue;
                 }
                 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'module': function(aValue) {
         //      aValue = 'Clipperz.PM.Compact'
 //
         //      if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
         //      if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
         //      if (typeof(Clipperz.PM.UI.Common.Components) == 'undefined') { Clipperz.PM.UI.Common.Components = {}; }
 
-//console.log(">>> module: " + aValue);
                 var currentScope;
                 var pathElements;
                 var i,c;
                 
                 currentScope = window;
                 pathElements = aValue.split('.');
                 c = pathElements.length;
                 for (i=0; i<c; i++) {
-//console.log("--- current path element: " + pathElements[i]);
-//console.log("--- current scope", currentScope);
                         if (typeof(currentScope[pathElements[i]]) == 'undefined') {
                                 currentScope[pathElements[i]] = {};
                         }
                         
                         currentScope = currentScope[pathElements[i]];
                 }
         },
         
         //-------------------------------------------------------------------------
 
         'exception': {
                         'AbstractMethod':       new MochiKit.Base.NamedError("Clipperz.Base.exception.AbstractMethod"),
                         'UnknownType':          new MochiKit.Base.NamedError("Clipperz.Base.exception.UnknownType"),
                         'VulnerabilityIssue':new MochiKit.Base.NamedError("Clipperz.Base.exception.VulnerabilityIssue"),
                         'MandatoryParameter':new MochiKit.Base.NamedError("Clipperz.Base.exception.MandatoryParameter"),
                         'ObjectNotFound':       new MochiKit.Base.NamedError("Clipperz.Base.exception.ObjectNotFound"),
                 'raise': function (aName) {
                         throw Clipperz.Base.exception[aName];
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'extend': YAHOO.extendX,
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 
 });
 
         //Original regExp courtesy of John Gruber: http://daringfireball.net/2009/11/liberal_regex_for_matching_urls
         //Updated to match Clipperz usage pattern.
 //MochiKit.Base.urlRegExp = new RegExp(/\b(([\w-]+:\/\/?|www[.])[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|\/)))/);
 MochiKit.Base.urlRegExp = new RegExp(/^((([\w-]+:\/\/?)|(www\.))[^\s()<>]+((?:\([\w\d]+\)|([^[:punct:]\s]|\/)))?)/);
 
         //RegExp found here: http://www.tipsntracks.com/117/validate-an-email-address-using-regular-expressions.html
 MochiKit.Base.emailRegExp = new RegExp(/^([a-zA-Z0-9_\-\.]+)@(([a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3}))|(([01]?\d\d?|2[0-4]\d|25[0-5])\.){3}([01]?\d\d?|25[0-5]|2[0-4]\d))$/);
 
 
 MochiKit.Base.registerComparator('Object dummy comparator',
         function(a, b) {
                 return ((a.constructor == Object) && (b.constructor == Object));
         },
         function(a, b) {
                 var result;
                 var aKeys;
                 var bKeys;
                 
-//MochiKit.Logging.logDebug(">>> comparator");
-//MochiKit.Logging.logDebug("- a: " + Clipperz.Base.serializeJSON(a));
-//MochiKit.Logging.logDebug("- b: " + Clipperz.Base.serializeJSON(a));
                 aKeys = MochiKit.Base.keys(a).sort();
                 bKeys = MochiKit.Base.keys(b).sort();
-                
                 result = MochiKit.Base.compare(aKeys, bKeys);
-//if (result != 0) {
-        //MochiKit.Logging.logDebug("- comparator 'keys':");
-        //MochiKit.Logging.logDebug("- comparator aKeys: " + Clipperz.Base.serializeJSON(aKeys));
-        //MochiKit.Logging.logDebug("- comparator bKeys: " + Clipperz.Base.serializeJSON(bKeys));
-//}
+
                 if (result == 0) {
                                 vari, c;
                         
                         c = aKeys.length;
                         for (i=0; (i<c) && (result == 0); i++) {
                                 result = MochiKit.Base.compare(a[aKeys[i]], b[bKeys[i]]);
-//if (result != 0) {
-        //MochiKit.Logging.logDebug("- comparator 'values':");
-        //MochiKit.Logging.logDebug("- comparator a[aKeys[i]]: " + Clipperz.Base.serializeJSON(a[aKeys[i]]));
-        //MochiKit.Logging.logDebug("- comparator b[bKeys[i]]: " + Clipperz.Base.serializeJSON(b[bKeys[i]]));
-//}
                         }
                         }       
                 
-//MochiKit.Logging.logDebug("<<< comparator - result: " + result);
                 return result;
         },
         true
 );
diff --git a/frontend/gamma/js/Clipperz/ByteArray.js b/frontend/gamma/js/Clipperz/ByteArray.js
index ae586e7..22c7c6e 100644
--- a/frontend/gamma/js/Clipperz/ByteArray.js
+++ b/frontend/gamma/js/Clipperz/ByteArray.js
@@ -1,46 +1,44 @@
 /*
 
-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 = {}; }
 
 //=============================================================================
 
 Clipperz.ByteArray_abstract = function(args) {
         return this;
 }
 
 Clipperz.ByteArray_abstract.prototype = MochiKit.Base.update(null, {
 
         //-------------------------------------------------------------------------
 
         'toString': function() {
                 return "Clipperz.ByteArray_abstract";
         },
         
         //-------------------------------------------------------------------------
 
         'equals': function(aValue) {
                 return (this.compare(aValue) == 0);
         },
@@ -68,53 +66,50 @@ Clipperz.ByteArray_abstract.prototype = MochiKit.Base.update(null, {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'newInstance': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         //-------------------------------------------------------------------------
 
         'reset': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         //-------------------------------------------------------------------------
         
         'length': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         //-------------------------------------------------------------------------
 
         'checkByteValue': function(aValue) {
-//Clipperz.log("aValue", aValue.toString(16));
-//Clipperz.log("(aValue & 0xff)", (aValue & 0xff).toString(16));
-
                 if ((aValue & 0xff) != aValue) {
-                        MochiKit.Logging.logError("Clipperz.ByteArray.appendByte: the provided value (0x" + aValue.toString(16) + ") is not a byte value.");
+                        Clipperz.logError("Clipperz.ByteArray.appendByte: the provided value (0x" + aValue.toString(16) + ") is not a byte value.");
                         throw Clipperz.ByteArray.exception.InvalidValue;
                 }
         },
         
         //-------------------------------------------------------------------------
 
         'xorMergeWithBlock': function(aBlock, anAllignment, paddingMode) {
                 var result;
                 var a, b;
                 var aLength;
                         var bLength;            
                 var i, c;
                 
                 if (this.length() > aBlock.length()) {
                         a = this;
                         b = aBlock;
                 } else {
                         a = aBlock;
                         b = this;
                 }
 
                 aLength = a.length();
                 bLength = b.length();
 
@@ -123,70 +118,58 @@ Clipperz.ByteArray_abstract.prototype = MochiKit.Base.update(null, {
                                 if (anAllignment == 'left') {
                                         a = a.split(0, bLength);
                                 } else {
                                         a = a.split(aLength - bLength);
                                 }
                         } else {
                                 var ii, cc;
                                 var padding;
                                 
         //                      padding = new Clipperz.ByteArray();
                                 padding = this.newInstance();
                                 cc = aLength - bLength;
                                 for (ii=0; ii<cc; ii++) {
                                         padding.appendByte(0);
                                 }
                                 
                                 if (anAllignment == 'left') {
                                         b = b.appendBlock(padding);
                                 } else {
                                         b = padding.appendBlock(b);
                                 }
                         }
                 }
 
-
-        //      result = new Clipperz.ByteArray();
                 result = this.newInstance();
                 c = a.length();
                 for (i=0; i<c; i++) {
                         result.appendByte(a.byteAtIndex(i) ^ b.byteAtIndex(i));
                 }
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
-/*
-        'shiftLeft': function(aNumberOfBitsToShift) {
-                var result;
-
-                        result = this.clone();  //???????????
-                
-                return result;
-        },
-        */
-        //-------------------------------------------------------------------------
 
         'appendBlock': function(aBlock) {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'appendByte': function(aValue) {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         'appendBytes': function(args) {
                         varvalues;
                         vari,c;
 
                 if (args.constructor == Array) {
                         values = args;
                 } else {
                         values = arguments;
                 }
 
                 c = values.length;
                 for (i=0; i<c; i++) {
                         this.appendByte(values[i]);
@@ -271,180 +254,158 @@ Clipperz.ByteArray_abstract.prototype = MochiKit.Base.update(null, {
         
         'setByteAtIndex': function(aValue, anIndex) {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
 
         //-------------------------------------------------------------------------
 
         'bitAtIndex': function(aBitPosition) {
                 var result;
                         varbytePosition;
                 var bitPositionInSelectedByte;
                 var selectedByte;
                 var selectedByteMask;
                 
                 bytePosition = this.length() - Math.ceil((aBitPosition + 1)/ 8);
                 bitPositionInSelectedByte = aBitPosition % 8;
                 selectedByte = this.byteAtIndex(bytePosition);
 
                 if (bitPositionInSelectedByte > 0) {
                         selectedByteMask = (1 << bitPositionInSelectedByte);
                 } else {
                         selectedByteMask = 1;
                 }
                 result = selectedByte & selectedByteMask ? 1 : 0;
-//console.log("aBitPosition: " + aBitPosition + ", length: " + this.length() + ", bytePosition: " + bytePosition + ", bitPositionInSelectedByte: " + bitPositionInSelectedByte + ", selectedByteMask: " + selectedByteMask);
                 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'bitBlockAtIndexWithSize': function(aBitPosition, aSize) {
                 var result;
                 var bitValue;
                 var i,c;
                 
                 result = 0;
                 c = aSize;
                 for (i=0; i<c; i++) {
                         bitValue = this.bitAtIndex(aBitPosition + i);
                         result = result | bitValue << i;
                 }
                 
                 return result;
         },
         
         //-------------------------------------------------------------------------
 
         'asString': function() {
                         varresult;
                         varlength;
                         vari;
 
-//var startTime = new Date();
-
-        //#     result = "";
                 result = [];
                 
                 i = 0;
                 length = this.length();
                 
                 while (i < length) {
                                 varcurrentCharacter;
                                 varcurrentByte;
                                 varunicode;
                         
                         currentByte = this.byteAtIndex(i);
                         
                                 if ((currentByte & 0x80) == 0x00 ) {            //0xxxxxxx
                                 unicode = currentByte;
                                 currentCharacter = String.fromCharCode(unicode);
                                 } else if ((currentByte & 0xe0) == 0xc0 ) {     //110xxxxx 10xxxxxx
                                 unicode = (currentByte & 0x1f) << 6;
                                 i++; currentByte = this.byteAtIndex(i);
                                 unicode = unicode | (currentByte & 0x3f);
 
                                 currentCharacter = String.fromCharCode(unicode);
                                 } else if ((currentByte & 0xf0) == 0xe0 ) {     //1110xxxx 10xxxxxx 10xxxxxx
                                 unicode = (currentByte & 0x0f) << (6+6);
                                 i++; currentByte = this.byteAtIndex(i);
                                 unicode = unicode | ((currentByte & 0x3f) << 6);
                                 i++; currentByte = this.byteAtIndex(i);
                                 unicode = unicode | (currentByte & 0x3f);
                                 
                                 currentCharacter = String.fromCharCode(unicode);
                                 } else {                                                                        //11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
                                 unicode = (currentByte & 0x07) << (6+6+6);
                                 i++; currentByte = this.byteAtIndex(i);
                                 unicode = unicode | ((currentByte & 0x3f) << (6+6));
                                 i++; currentByte = this.byteAtIndex(i);
                                 unicode = unicode | ((currentByte & 0x3f) << 6);
                                 i++; currentByte = this.byteAtIndex(i);
                                 unicode = unicode | (currentByte & 0x3f);
                                 
                                 currentCharacter = String.fromCharCode(unicode);
                         }
                         
-        //              result += currentCharacter;
                         result.push(currentCharacter);
                         i++;
                 }
 
-//MochiKit.Logging.logDebug("[" + (new Date() - startTime) + "] ByteArray.asString");
-
-        //      return result;
                 return result.join("");
         },
 
         //-------------------------------------------------------------------------
 
         'toHexString': function() {
                 throw Clipperz.Base.exception.AbstractMethod;
         },
         
         //-------------------------------------------------------------------------
         
         'base64map': "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
         'base64mapIndex': "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(''),
-        //'base64mapInvertedIndex': {
-        //      'A':  0, 'B':  1, 'C':  2, 'D':  3, 'E':  4, 'F':  5, 'G':  6, 'H':  7, 'I':  8, 'J':  9,
-        //      'K': 10, 'L': 11, 'M': 12, 'N': 13, 'O': 14, 'P': 15, 'Q': 16, 'R': 17, 'S': 18, 'T': 19,
-        //      'U': 20, 'V': 21, 'W': 22, 'X': 23, 'Y': 24, 'Z': 25, 'a': 26, 'b': 27, 'c': 28, 'd': 29,
-        //      'e': 30, 'f': 31, 'g': 32, 'h': 33, 'i': 34, 'j': 35, 'k': 36, 'l': 37, 'm': 38, 'n': 39,
-        //      'o': 40, 'p': 41, 'q': 42, 'r': 43, 's': 44, 't': 45, 'u': 46, 'v': 47, 'w': 48, 'x': 49,
-        //      'y': 50, 'z': 51, '0': 52, '1': 53, '2': 54, '3': 55, '4': 56, '5': 57, '6': 58, '7': 59,
-        //      '8': 60, '9': 61, '+': 62, '/': 63,
-        //      "=": -1},
 
         //-------------------------------------------------------------------------
         
         'appendBase64String': function(aValue) {
                 var i;
                 var length;
 
                 length = aValue.length;
                 
                 if ((length % 4) != 0) {
-                        MochiKit.Logging.logError("the value passed to the 'ByteArray.setBase64Value' is not correct");
+                        Clipperz.logError("the value passed to the 'ByteArray.setBase64Value' is not correct");
                         throw Clipperz.ByteArray.exception.InvalidValue;
                 }
 
                 i = 0;
                 while (i<length) {
                         var value1, value2, value3, value4;
                         var byte1, byte2, byte3;
                         
                         value1 = this.base64map.indexOf(aValue.charAt(i));
                         value2 = this.base64map.indexOf(aValue.charAt(i+1));
                         value3 = this.base64map.indexOf(aValue.charAt(i+2));
                         value4 = this.base64map.indexOf(aValue.charAt(i+3));
 
-        //              value1 = this.base64mapInvertedIndex[aValue.charAt(i)];
-        //              value2 = this.base64mapInvertedIndex[aValue.charAt(i+1)];
-        //              value3 = this.base64mapInvertedIndex[aValue.charAt(i+2)];
-        //              value4 = this.base64mapInvertedIndex[aValue.charAt(i+3)];
-
                         byte1 = (value1 << 2) | ((value2 & 0x30) >> 4);
                         if (value3 != -1) {
                                 byte2 = ((value2 & 0x0f) << 4) | ((value3 & 0x3c) >> 2);
 
                                 if (value4 != -1) {
                                         byte3 = ((value3 & 0x03) << 6) | (value4);
                                 } else {
                                         byte3 = null;
                                 }
                         } else {
                                 byte2 = null;
                                 byte3 = null;
                         }
 
                         this.appendByte(byte1);
                         this.appendByte(byte2);
                         this.appendByte(byte3);
 
                         i += 4;
                 }
                 
                 return this;
         },
 
@@ -499,49 +460,49 @@ Clipperz.ByteArray_abstract.prototype = MochiKit.Base.update(null, {
         },
 
         //-------------------------------------------------------------------------
 
         'base32map': "0123456789abcdefghjkmnpqrstvwxyz",
         'base32mapIndex': "0123456789abcdefghjkmnpqrstvwxyz".split(''),
 
         //-------------------------------------------------------------------------
         
         'appendBase32String': function(aValue) {
                 var value;
                 var i;
                 var length;
                 var value1, value2, value3, value4, value5, value6, value7, value8;
                 var byte1, byte2, byte3, byte4, byte5;
 
                 value = aValue.toLowerCase();
                 value = value.replace(/[\s\-]/g, '');
                 value = value.replace(/[0o]/g, '0');
                 value = value.replace(/[1il]/g, '1');
 
                 length = value.length;
                 
                 if ((length % 8) != 0) {
-                        MochiKit.Logging.logError("the value passed to the 'ByteArray.setBase32Value' is not correct");
+                        Clipperz.logError("the value passed to the 'ByteArray.setBase32Value' is not correct");
                         throw Clipperz.ByteArray.exception.InvalidValue;
                 }
 
                 i = 0;
                 while (i<length) {
                         value1 = this.base32map.indexOf(value.charAt(i));
                         value2 = this.base32map.indexOf(value.charAt(i+1));
                         value3 = this.base32map.indexOf(value.charAt(i+2));
                         value4 = this.base32map.indexOf(value.charAt(i+3));
                         value5 = this.base32map.indexOf(value.charAt(i+4));
                         value6 = this.base32map.indexOf(value.charAt(i+5));
                         value7 = this.base32map.indexOf(value.charAt(i+6));
                         value8 = this.base32map.indexOf(value.charAt(i+7));
 
                         byte1 = byte2 = byte3 = byte4 = byte5 = null;
                         
                         byte1 = (value1 << 3) | ((value2 & 0x1c) >> 2);
                         if (value3 != -1) {
                                 byte2 = ((value2 & 0x03) << 6) | (value3 << 1) | ((value4 & 0x10) >> 4);
                                 if (value5 != -1) {
                                         byte3 = ((value4 & 0x0f) << 4) | ((value5 & 0x1e) >> 1);
                                         if (value6 != -1) {
                                                 byte4 = ((value5 & 0x01) << 7) | (value6 << 2) | ((value7 & 0x18) >> 3);
                                                 if (value8 != -1) {
@@ -707,49 +668,49 @@ Clipperz.ByteArray_abstract.prototype = MochiKit.Base.update(null, {
 //=============================================================================
 //
         //Clipperz.ByteArray_hex
 //
 //=============================================================================
 /*
 Clipperz.ByteArray_hex = function (args) {
         this._value = "";
 
         if (typeof(args) != 'undefined') {
                 if (args.constructor == Array) {
                         this.appendBytes(args);
                 } else if (args.constructor == String) {
                         if (args.indexOf("0x") == 0) {
                                         varvalue;
                         
                                 value = args.substring(2).toLowerCase();
                                         if (/[0123456789abcdef]* /.test(value)) { the space in the regexp shoud be removed if the code is activate
                                         if ((value.length % 2) == 0) {
                                                 this._value = value;
                                         } else {
                                                 this._value = "0" + value;
                                         }
                                 } else {
-MochiKit.Logging.logError("Clipperz.ByteArray should be inizialized with an hex string.");
+Clipperz.logError("Clipperz.ByteArray should be inizialized with an hex string.");
                                         throw Clipperz.ByteArray.exception.InvalidValue;
                                 }
                         } else {
                                         varvalue;
                                         vari,c;
 
                                 c = args.length;
                                 value = new Array(c);
                                 for (i=0; i<c; i++) {
                                         value.push(Clipperz.ByteArray.unicodeToUtf8HexString(args.charCodeAt(i)));
                                 }
 
                                 this._value = value.join("");
                         }
                 } else {
                         this.appendBytes(MochiKit.Base.extend(null, arguments));
                 }
         }
         return this;
 }
 
 Clipperz.ByteArray_hex.prototype = MochiKit.Base.update(new Clipperz.ByteArray_abstract(), {
 
         //-------------------------------------------------------------------------
@@ -893,49 +854,49 @@ Clipperz.ByteArray_hex.prototype = MochiKit.Base.update(new Clipperz.ByteArray_a
 
 //=============================================================================
 //
         //Clipperz.ByteArray_array
 //
 //=============================================================================
 
 Clipperz.ByteArray_array = function (args) {
         if (typeof(args) != 'undefined') {
                 if (args.constructor == Array) {
                         this._value = args.slice(0);
                 } else if (args.constructor == String) {
                         var result;
                                 varvalue;
                         var i, c;
                         
                         if (args.indexOf("0x") == 0) {
                         
                                 value = args.substring(2).toLowerCase();
                                 if (/[0123456789abcdef]*/.test(value)) {
                                         if ((value.length % 2) != 0) {
                                                 value = "0" + value;
                                         }
                                 } else {
-MochiKit.Logging.logError("Clipperz.ByteArray should be inizialized with an hex string.");
+                                        Clipperz.logError("Clipperz.ByteArray should be inizialized with an hex string.");
                                         throw Clipperz.ByteArray.exception.InvalidValue;
                                 }
 
                                 c = value.length / 2
                                 result = new Array(c);
                                 for (i=0; i<c; i++) {
                                         result[i] = parseInt(value.substr(i*2, 2), 16);
                                 }
 
                         } else {
                                 var unicode;
                                 result = [];
                                 c = args.length;
                                 for (i=0; i<c; i++) {
         //                              Clipperz.ByteArray.pushUtf8BytesOfUnicodeChar(result, args.charCodeAt(i));
 
                                         unicode = args.charCodeAt(i);
                                                 if (unicode <= 0x7f) {                                                                          //0x00000000 - 0x0000007f -> 0xxxxxxx
                                                 result.push(unicode);
                                         //      } else if ((unicode >= 0x80) && (unicode <= 0x7ff)) {           //0x00000080 - 0x000007ff -> 110xxxxx 10xxxxxx
                                                 } else if (unicode <= 0x7ff) {          //0x00000080 - 0x000007ff -> 110xxxxx 10xxxxxx
                                                 result.push((unicode >> 6) | 0xc0);
                                                 result.push((unicode & 0x3F) | 0x80);
                                         //      } else if ((unicode >= 0x0800) && (unicode <= 0xffff)) {        //0x00000800 - 0x0000ffff -> 1110xxxx 10xxxxxx 10xxxxxx
@@ -1094,49 +1055,49 @@ Clipperz.ByteArray_array.prototype = MochiKit.Base.update(new Clipperz.ByteArray
 //
         //Clipperz.ByteArray_string
 //
 //=============================================================================
 /*
 Clipperz.ByteArray_string = function (args) {
         this._value = "";
 
         if (typeof(args) != 'undefined') {
                 if (args.constructor == Array) {
                         this.appendBytes(args);
                 } else if (args.constructor == String) {
                         var result;
                                 varvalue;
                         var i, c;
                         
                         if (args.indexOf("0x") == 0) {
                         
                                 value = args.substring(2).toLowerCase();
                                 if (/[0123456789abcdef]* /.test(value)) { the space in the regexp shoud be removed if the code is activated
                                         if ((value.length % 2) != 0) {
                                                 value = "0" + value;
                                         }
                                 } else {
-MochiKit.Logging.logError("Clipperz.ByteArray should be inizialized with an hex string.");
+Clipperz.logError("Clipperz.ByteArray should be inizialized with an hex string.");
                                         throw Clipperz.ByteArray.exception.InvalidValue;
                                 }
                         } else {
                                 value = "";
                                 c = args.length;
                                 for (i=0; i<c; i++) {
                                         value += Clipperz.ByteArray.unicodeToUtf8HexString(args.charCodeAt(i));
                                 }
                         }
                         
                         c = value.length / 2
                         for (i=0; i<c; i++) {
                                 this.appendByte(parseInt(value.substr(i*2, 2), 16));
                         }
                 } else {
                         this.appendBytes(MochiKit.Base.extend(null, arguments));
                 }
         }
         
         return this;
 }
 
 Clipperz.ByteArray_string.prototype = MochiKit.Base.update(new Clipperz.ByteArray_abstract(), {
 
diff --git a/frontend/gamma/js/Clipperz/CSVProcessor.js b/frontend/gamma/js/Clipperz/CSVProcessor.js
index 0b18731..1288ed7 100644
--- a/frontend/gamma/js/Clipperz/CSVProcessor.js
+++ b/frontend/gamma/js/Clipperz/CSVProcessor.js
@@ -1,46 +1,44 @@
 /*
 
-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 = {}; }
 
 
 Clipperz.CSVProcessor = function(args) {
         args = args || {};
 
         //      this._status    = undefined;
         //      this._error_input= undefined;
         //      this._string    = undefined;
         //      this._fields    = undefined;
 
                 this._quoteChar                 = args['quoteChar']     ||"\042";
                 this._eol                       = args['eol']                   ||"";
                 this._escapeChar        = args['escapeChar']    ||"\042";
                 this._separatorChar     = args['separatorChar']         ||",";
                 this._binary            = args['binary']                ||false;
                 this._alwaysQuote       = args['alwaysQuote']   ||false;
 
         return this;
 }
 
@@ -74,71 +72,71 @@ Clipperz.CSVProcessor.prototype = MochiKit.Base.update(null, {
         
         'setSeparatorChar': function(aValue) {
                 this._separatorChar = aValue;
         },
         
         //-------------------------------------------------------------------------
         
         'binary': function() {
                 return this._binary;
         },
 
         //-------------------------------------------------------------------------
 
         'alwaysQuote': function() {
                 return this._alwaysQuote;
         },
         
         //-------------------------------------------------------------------------
 /*
         'parse': function(aValue) {
                 var result;
                 var lines;
                 var parameter;
                 
-//MochiKit.Logging.logDebug(">>> CSVProcessor.parse");
+//Clipperz.logDebug(">>> CSVProcessor.parse");
                 result = [];
                 
                 lines = aValue.replace(/\r?\n/g, "\n").replace(/^\n*                    /g, "").replace(/\n$/g, "");;
                 parameter = {
                         line: lines
                 }
 
                 do {
                         var fields;
                         
                         fields = this.parseLine(parameter);
                         
                         if (fields != null) {
                                 result.push(fields);
                         }
                         
                         parameter.line = parameter.line.replace(/^\n*                        /g, "").replace(/\n$/g, "");
 
-//MochiKit.Logging.logDebug("line: '" + parameter.line + "'");
+//Clipperz.logDebug("line: '" + parameter.line + "'");
                 } while (parameter.line != "");
-//MochiKit.Logging.logDebug("--- CSVProcessor.parse - result: " + Clipperz.Base.serializeJSON(result));
-//MochiKit.Logging.logDebug("<<< CSVProcessor.parse");
+//Clipperz.logDebug("--- CSVProcessor.parse - result: " + Clipperz.Base.serializeJSON(result));
+//Clipperz.logDebug("<<< CSVProcessor.parse");
 
                 return result;
         },
 */
         //-------------------------------------------------------------------------
 
         'deferredParse_core': function(aContext) {
                 var deferredResult;
                 
                 if (aContext.line == "") {
                         deferredResult = MochiKit.Async.succeed(aContext.result);
                 } else {
                         var fields;
                         
                         fields = this.parseLine(aContext);
                         if (fields != null) {
                                 aContext.result.push(fields);
                         }
 
                         aContext.line = aContext.line.replace(/^\n*/g, "").replace(/\n$/g, "");
                         
                         deferredResult = new Clipperz.Async.Deferred("CVSProcessor.deferredParse_core");
         //              deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'importProcessorProgressUpdate', {status:'processing', size:aContext.size, progress:(aContext.size - aContext.line.length)});
                         deferredResult.addCallbackPass(MochiKit.Signal.signal, this, 'importProcessorProgressUpdate', {status:'processing', size:aContext.size, progress:(aContext.size - aContext.line.length)});
@@ -195,152 +193,152 @@ Clipperz.CSVProcessor.prototype = MochiKit.Base.update(null, {
         //-------------------------------------------------------------------------
 
         'parseField': function(aParameter) {
                 var result;
                 
                 var inQuotes;
                 var validRegExp;
                 var singleQuoteBeginRegexp;
                 var escapedQuoteBeginRegexp;
                 var singleQuoteCommaEndRegexp;
                 var singleQuoteNewLineEndRegexp;
                 var commaBeginRegexp;
                 var newlineRegexp;
                 
                 
                         singleQuoteBeginRegexp  = new RegExp("^" + '\\' + this.quoteChar());
                         escapedQuoteBeginRegexp         = new RegExp("^" + '\\' + this.escapeChar() + '\\' + this.quoteChar());
                         singleQuoteCommaEndRegexp= new RegExp("^" + '\\' + this.quoteChar() + '\\' + this.separatorChar());
                         singleQuoteNewLineEndRegexp= new RegExp("^" + '\\' + this.quoteChar() + "\n");
                         commaBeginRegexp                = new RegExp("^" + '\\' + this.separatorChar());
                         newlineRegexp                   = new RegExp("^\n");
 
                 inQuotes = false;
                 
-//MochiKit.Logging.logDebug("#################################### '" + aParameter.line + "'");
+//Clipperz.logDebug("#################################### '" + aParameter.line + "'");
                 if (aParameter.line == "") {
                         if (aParameter.isThereAnEmptyFinalField == true) {
                                 aParameter.isThereAnEmptyFinalField = false;
                                 result = "";
                         } else {
                                 result = null;
                         }
                 } else {
                         if (this.binary()) {
                                 validRegexp = /^./;
         //                      validRegexp = /^[^\\]/;
                         } else {
                                 validRegexp = /^[\t\040-\176]/;
                         }
                 
                         try {
                                 var done;
                         
                                 done = false;
                                 result = "";
                         
                                 while (!done) {
                                         if (aParameter.line.length < 1) {
-//MochiKit.Logging.logDebug("---> 1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                 if (inQuotes == true) {
-//MochiKit.Logging.logDebug("---> 1.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 1.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                         throw new Error("CSV Parsing error; end of string, missing closing double-quote...");
                                                 } else {
-//MochiKit.Logging.logDebug("---> 1.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 1.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                         done = true;
                                                 }
                                         } else if (escapedQuoteBeginRegexp.test(aParameter.line)) {
-//MochiKit.Logging.logDebug("---> 2.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 2.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                 result += this.quoteChar();
                                                 aParameter.line = aParameter.line.substr(2, aParameter.line.length - 1);
-//MochiKit.Logging.logDebug("<--- 2.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("<--- 2.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                         } else if (singleQuoteBeginRegexp.test(aParameter.line)) {
-//MochiKit.Logging.logDebug("---> 3: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 3: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                 if (inQuotes == true) {
                                                         if (aParameter.line.length == 1) {
-//MochiKit.Logging.logDebug("---> 3.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 3.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                                 aParameter.line = '';
                                                                 done = true;
                                                         } else if (singleQuoteCommaEndRegexp.test(aParameter.line)) {
-//MochiKit.Logging.logDebug("---> 3.3: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 3.3: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                                 aParameter.line = aParameter.line.substr(2, aParameter.line.length - 1);
                                                                 done = true;
-//MochiKit.Logging.logDebug("<--- 3.3: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("<--- 3.3: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                         } else if (singleQuoteNewLineEndRegexp.test(aParameter.line)) {
                                                                 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
                                                                 done = true;
                                                         } else {
                                                                 throw new Error("CSV Parsing error; double-quote, followed by undesirable character (bad character sequence)... " + aParameter.line);
                                                         }
                                                 } else {
-//MochiKit.Logging.logDebug("---> 4: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 4: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                         if (result == "") {
-//MochiKit.Logging.logDebug("---> 4.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 4.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                                 inQuotes = true;
                                                                 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
-//MochiKit.Logging.logDebug("<--- 4.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("<--- 4.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                         } else {
                                                                 throw new Error("CSV Parsing error; double-quote, outside of double-quotes (bad character sequence)...");
                                                         }
                                                 }
                                         } else if (commaBeginRegexp.test(aParameter.line)) {
-//MochiKit.Logging.logDebug("---> 5: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 5: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                 if (inQuotes) {
-//MochiKit.Logging.logDebug("---> 5.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 5.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                         result += aParameter.line.substr(0 ,1);
                                                         aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
-//MochiKit.Logging.logDebug("<--- 5.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("<--- 5.1: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                 } else {
-//MochiKit.Logging.logDebug("---> 5.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 5.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                         aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
                                                         if (newlineRegexp.test(aParameter.line) || aParameter.line == "") {
-//MochiKit.Logging.logDebug("######");
+//Clipperz.logDebug("######");
                                                                 aParameter.isThereAnEmptyFinalField = true;
                                                         };
                                                         done = true;
-//MochiKit.Logging.logDebug("<--- 5.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("<--- 5.2: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                 }
                                         } else if (validRegexp.test(aParameter.line)) {
-//MochiKit.Logging.logDebug("---> 6: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("---> 6: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                                 result += aParameter.line.substr(0, 1);
                                                 aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
-//MochiKit.Logging.logDebug("<--- 6: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
+//Clipperz.logDebug("<--- 6: '" + aParameter.line.replace(/\n/g, "\\n") + "'");
                                         } else if (newlineRegexp.test(aParameter.line)) {
                                                 if (inQuotes == true) {
                                                         result += aParameter.line.substr(0 ,1);
                                                         aParameter.line = aParameter.line.substr(1, aParameter.line.length - 1);
                                                 } else {
                                                         if (result == "") {
                                                                 if (aParameter.isThereAnEmptyFinalField == true) {
                                                                         aParameter.isThereAnEmptyFinalField = false;
                                                                 } else {
                                                                         result = null;
                                                                 }
                                                         }
                                                         
                                                         done = true;
                                                 }
                                         } else { 
                                                 throw new Error("CSV Parsing error; an undesirable character... '" + aParameter.line.substr(0,1) + "'");
                                         }
                                 }
                         } catch(exception) {
-                                MochiKit.Logging.logError(exception.message);
+                                Clipperz.logError(exception.message);
         //                      result = null;
                                 throw exception;
                         }
                 }
 
 //if (result != null) {
-        //MochiKit.Logging.logDebug("<=== result: '" + result.replace(/\n/g, "\\n") + "'");
+        //Clipperz.logDebug("<=== result: '" + result.replace(/\n/g, "\\n") + "'");
 //} else {
-        //MochiKit.Logging.logDebug("<=== result: NULL");
+        //Clipperz.logDebug("<=== result: NULL");
 //}
                 
                 return result;
         },
         
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
 
 
diff --git a/frontend/gamma/js/Clipperz/Crypto/AES.js b/frontend/gamma/js/Clipperz/Crypto/AES.js
index c811f1c..cb56f11 100644
--- a/frontend/gamma/js/Clipperz/Crypto/AES.js
+++ b/frontend/gamma/js/Clipperz/Crypto/AES.js
@@ -1,46 +1,44 @@
 /*
 
-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.ByteArray) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.AES depends on Clipperz.ByteArray!";
 }  
 
         //Dependency commented to avoid a circular reference
 //try { if (typeof(Clipperz.Crypto.PRNG) == 'undefined') { throw ""; }} catch (e) {
         //throw "Clipperz.Crypto.AES depends on Clipperz.Crypto.PRNG!";
 //}  
 
 if (typeof(Clipperz.Crypto.AES) == 'undefined') { Clipperz.Crypto.AES = {}; }
 
 //#############################################################################
 
 Clipperz.Crypto.AES.DeferredExecutionContext = function(args) {
         args = args || {};
 
         this._key = args.key;
         this._message = args.message;
         this._result = args.message.clone();
         this._nonce = args.nonce;
         this._messageLength = this._message.length();
@@ -99,73 +97,72 @@ Clipperz.Crypto.AES.DeferredExecutionContext.prototype = MochiKit.Base.update(nu
         },
         
         'executionStep': function() {
                 return this._executionStep;
         },
         
         'setExecutionStep': function(aValue) {
                 this._executionStep = aValue;
         },
         
         'tuneExecutionParameters': function (anElapsedTime) {
 //var originalChunks = this._elaborationChunks;
                 if (anElapsedTime > 0) {
                         this._elaborationChunks = Math.round(this._elaborationChunks * ((anElapsedTime + 1000)/(anElapsedTime * 2)));
                 }
 //Clipperz.log("tuneExecutionParameters - elapsedTime: " +  anElapsedTime + /*originalChunks,*/ " chunks # " + this._elaborationChunks + " [" + this._executionStep + " / " + this._messageLength + "]");
         },
         
         'pause': function(aValue) {
         //      return MochiKit.Async.wait(Clipperz.Crypto.AES.DeferredExecution.pauseTime, aValue);
                 return MochiKit.Async.wait(this._pauseTime, aValue);
         },
         
         'isDone': function () {
-//console.log("isDone", this.executionStep(), this.messageLength());
                 return (this._executionStep >= this._messageLength);
         },
 
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 
 });
 
 //#############################################################################
 
 Clipperz.Crypto.AES.Key = function(args) {
         args = args || {};
 
         this._key = args.key;
         this._keySize = args.keySize || this.key().length();
         
         if (this.keySize() == 128/8) {
                 this._b = 176;
                 this._numberOfRounds = 10;
          } else if (this.keySize() == 256/8) {
                 this._b = 240;
                 this._numberOfRounds = 14;
         } else {
-                MochiKit.Logging.logError("AES unsupported key size: " + (this.keySize() * 8) + " bits");
+                Clipperz.logError("AES unsupported key size: " + (this.keySize() * 8) + " bits");
                 throw Clipperz.Crypto.AES.exception.UnsupportedKeySize;
         }
         
         this._stretchedKey = null;
         
         return this;
 }
 
 Clipperz.Crypto.AES.Key.prototype = MochiKit.Base.update(null, {
 
         'asString': function() {
                 return "Clipperz.Crypto.AES.Key (" + this.key().toHexString() + ")";
         },
         
         //-----------------------------------------------------------------------------
 
         'key': function() {
                 return this._key;
         },
 
         'keySize': function() {
                 return this._keySize;
         },
         
@@ -787,80 +784,76 @@ MochiKit.Base.update(Clipperz.Crypto.AES, {
                                 Clipperz.Crypto.AES.deferredEncryptBlocks
                         ], {trace:false}, anExecutionContext);
                 } else {
                         deferredResult = MochiKit.Async.succeed(anExecutionContext);
                 }
                 
                 return deferredResult;
         },
 
         //-----------------------------------------------------------------------------
         
         'deferredEncrypt': function(aKey, someData, aNonce) {
                 var deferredResult;
                         varexecutionContext;
                 var result;
                 var nonce;
                 var key;
 
                 key = new Clipperz.Crypto.AES.Key({key:aKey});
                 nonce = aNonce ? aNonce.clone() : Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(128/8);
 
                 executionContext = new Clipperz.Crypto.AES.DeferredExecutionContext({key:key, message:someData, nonce:nonce});
 
                 deferredResult = new Clipperz.Async.Deferred("AES.deferredEncrypt");
-//deferredResult.addCallback(function (aValue) { console.log(">>> deferredEncrypt"); return aValue; });
                 deferredResult.addCallback(Clipperz.Crypto.AES.deferredEncryptBlocks);
                 deferredResult.addCallback(function(anExecutionContext) {
                         var result;
                         
                         result = anExecutionContext.nonce().clone();
                         result.appendBytes(anExecutionContext.resultArray());
 
                         return result;
                 });
-//deferredResult.addCallback(function (aValue) { console.log("<<< deferredEncrypt"); return aValue; });
                 deferredResult.callback(executionContext)
 
                 return deferredResult;
         },
 
         //-----------------------------------------------------------------------------
 
         'deferredDecrypt': function(aKey, someData) {
                 var deferredResult
                 var nonce;
                 var message;
                 var key;
 
                 key = new Clipperz.Crypto.AES.Key({key:aKey});
                 nonce = someData.split(0, (128/8));
                 message = someData.split(128/8);
                 executionContext = new Clipperz.Crypto.AES.DeferredExecutionContext({key:key, message:message, nonce:nonce});
 
                 deferredResult = new Clipperz.Async.Deferred("AES.deferredDecrypt");
-//deferredResult.addCallback(function (aValue) { console.log(">>> deferredDecrypt"); return aValue; });
                 deferredResult.addCallback(Clipperz.Crypto.AES.deferredEncryptBlocks);
                 deferredResult.addCallback(function(anExecutionContext) {
                         return anExecutionContext.result();
                 });
-//deferredResult.addCallback(function (aValue) { console.log("<<< deferredDecrypt"); return aValue; });
                 deferredResult.callback(executionContext);
 
                 return deferredResult;
         },
         
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
         
 });
 
 //#############################################################################
 
 //Clipperz.Crypto.AES.DeferredExecution = {
         //      'chunkSize': 16384,     //      4096,   //      1024    4096    8192    1638432768;
         //      'pauseTime': 0.02       //0.2
 //}
 
 Clipperz.Crypto.AES.exception = {
         'UnsupportedKeySize':    new MochiKit.Base.NamedError("Clipperz.Crypto.AES.exception.UnsupportedKeySize") 
 };
diff --git a/frontend/gamma/js/Clipperz/Crypto/Base.js b/frontend/gamma/js/Clipperz/Crypto/Base.js
index d3a8e36..9acfc49 100644
--- a/frontend/gamma/js/Clipperz/Crypto/Base.js
+++ b/frontend/gamma/js/Clipperz/Crypto/Base.js
@@ -1,46 +1,44 @@
 /*
 
-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.Base) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.Base depends on Clipperz.Base!";
 }  
 
 if (typeof(Clipperz.Crypto) == 'undefined') { Clipperz.Crypto = {}; }
 if (typeof(Clipperz.Crypto.Base) == 'undefined') { Clipperz.Crypto.Base = {}; }
 
 Clipperz.Crypto.Base.VERSION = "0.1";
 Clipperz.Crypto.Base.NAME = "Clipperz.Crypto.Base";
 
 //#############################################################################
         //Downloaded on March 30, 2006 from http://anmar.eu.org/projects/jssha2/files/jssha2-0.3.zip (jsSha2/sha256.js)
 //#############################################################################
 
 /* A JavaScript implementation of the Secure Hash Algorithm, SHA-256
  * Version 0.3 Copyright Angel Marin 2003-2004 - http://anmar.eu.org/
  * Distributed under the BSD License
  * Some bits taken from Paul Johnston's SHA-1 implementation
  */
 var chrsz = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode  */
 function safe_add (x, y) {
diff --git a/frontend/gamma/js/Clipperz/Crypto/BigInt.js b/frontend/gamma/js/Clipperz/Crypto/BigInt.js
index 41483a3..031ed30 100644
--- a/frontend/gamma/js/Clipperz/Crypto/BigInt.js
+++ b/frontend/gamma/js/Clipperz/Crypto/BigInt.js
@@ -1,46 +1,44 @@
 /*
 
-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.Crypto) == 'undefined') { Clipperz.Crypto = {}; }
 
 //#############################################################################
         //Downloaded on March 05, 2007 from http://www.leemon.com/crypto/BigInt.js
 //#############################################################################
 
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // Big Integer Library v. 5.0
 // Created 2000, last modified 2006
 // Leemon Baird
 // www.leemon.com
 //
 // This file is public domain.   You can use it for any purpose without restriction.
 // I do not guarantee that it is correct, so use it at your own risk.  If you use 
 // it for something interesting, I'd appreciate hearing about it.  If you find 
 // any bugs or make any improvements, I'd appreciate hearing about those too.
 // It would also be nice if my name and address were left in the comments.
 // But none of that is required.
 //
@@ -1456,49 +1454,48 @@ MochiKit.Base.update(Clipperz.Crypto.BigInt.prototype, {
         'isBigInt': true,
         
         //-------------------------------------------------------------------------
 
         'toString': function(aBase) {
                 return this.asString(aBase);
         },
 
         //-------------------------------------------------------------------------
 
         'asString': function (aBase, minimumLength) {
                         varresult;
                         varbase;
 
                 if (typeof(aBase) == 'undefined') {
                         base = 10;
                 } else {
                         base = aBase;
                 }
                 
                 result = bigInt2str(this.internalValue(), base).toLowerCase();
 
                 if ((typeof(minimumLength) != 'undefined') && (result.length < minimumLength)) {
                         var i, c;
-        //MochiKit.Logging.logDebug(">>> FIXING BigInt.asString length issue")          
                         c = (minimumLength - result.length);
                         for (i=0; i<c; i++) {
                                 result = '0' + result;
                         }
                 }
                 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'asByteArray': function() {
                 return new Clipperz.ByteArray("0x" + this.asString(16), 16);
         },
         
         //-------------------------------------------------------------------------
 
         'equals': function (aValue) {
                 var result;
                 
                 if (aValue.isBigInt) {
                          result = equals(this.internalValue(), aValue.internalValue());
                 } else if (typeof(aValue) == "number") {
                         result = equalsInt(this.internalValue(), aValue);
diff --git a/frontend/gamma/js/Clipperz/Crypto/BigInt_scoped.js b/frontend/gamma/js/Clipperz/Crypto/BigInt_scoped.js
index f91c7e9..bc60330 100644
--- a/frontend/gamma/js/Clipperz/Crypto/BigInt_scoped.js
+++ b/frontend/gamma/js/Clipperz/Crypto/BigInt_scoped.js
@@ -1,46 +1,44 @@
 /*
 
-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.Crypto) == 'undefined') { Clipperz.Crypto = {}; }
 
 if (typeof(Leemon) == 'undefined') { Leemon = {}; }
 if (typeof(Baird.Crypto) == 'undefined') { Baird.Crypto = {}; }
 if (typeof(Baird.Crypto.BigInt) == 'undefined') { Baird.Crypto.BigInt = {}; }
 
 
 //#############################################################################
         //Downloaded on March 05, 2007 from http://www.leemon.com/crypto/BigInt.js
 //#############################################################################
 
 ////////////////////////////////////////////////////////////////////////////////////////
 // Big Integer Library v. 5.0
 // Created 2000, last modified 2006
 // Leemon Baird
 // www.leemon.com
 //
 // This file is public domain.   You can use it for any purpose without restriction.
 // I do not guarantee that it is correct, so use it at your own risk.  If you use 
 // it for something interesting, I'd appreciate hearing about it.  If you find 
diff --git a/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Curve.js b/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Curve.js
index 19f19c2..0d76b9c 100644
--- a/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Curve.js
+++ b/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Curve.js
@@ -1,46 +1,44 @@
 /*
 
-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.ByteArray) == 'undefined') { throw ""; }} catch (e) {
         //throw "Clipperz.Crypto.ECC depends on Clipperz.ByteArray!";
 //}  
 if (typeof(Clipperz.Crypto.ECC) == 'undefined') { Clipperz.Crypto.ECC = {}; }
 if (typeof(Clipperz.Crypto.ECC.BinaryField) == 'undefined') { Clipperz.Crypto.ECC.BinaryField = {}; }
 
 Clipperz.Crypto.ECC.BinaryField.Curve = function(args) {
         args = args || {};
 
         this._modulus = args.modulus;
         
         this._a = args.a;
         this._b = args.b;
         this._G = args.G;
         this._r = args.r;
         this._h = args.h;
 
         this._finiteField = null;
         
         return this;
 }
@@ -81,274 +79,234 @@ Clipperz.Crypto.ECC.BinaryField.Curve.prototype = MochiKit.Base.update(null, {
 
         'finiteField': function() {
                 if (this._finiteField == null) {
                         this._finiteField = new Clipperz.Crypto.ECC.BinaryField.FiniteField({modulus:this.modulus()})
                 }
                 
                 return this._finiteField;
         },
 
         //-----------------------------------------------------------------------------
 
         'negate': function(aPointA) {
                 var result;
 
                 result = new Clipperz.Crypto.ECC.Point({x:aPointA.x(), y:this.finiteField().add(aPointA.y(), aPointA.x())})
                 
                 return result;
         },
         
         //-----------------------------------------------------------------------------
 
         'add': function(aPointA, aPointB) {
                 var result;
 
-//console.log(">>> ECC.BinaryField.Curve.add");
                 if (aPointA.isZero()) {
-//console.log("--- pointA == zero");
                         result = aPointB;
                 } else if (aPointB.isZero()) {
-//console.log("--- pointB == zero");
                         result = aPointA;
                         } else if ((aPointA.x().compare(aPointB.x()) == 0) && ((aPointA.y().compare(aPointB.y()) != 0) || aPointB.x().isZero())) {
-//console.log("compare A.x - B.x: ", aPointA.x().compare(aPointB.x()));
-//console.log("compare A.y - B.y: ", (aPointA.y().compare(aPointB.y()) != 0));
-//console.log("compare B.x.isZero(): ", aPointB.x().isZero());
-
-//console.log("--- result = zero");
                         result = new Clipperz.Crypto.ECC.BinaryField.Point({x:Clipperz.Crypto.ECC.BinaryField.Value.O, y:Clipperz.Crypto.ECC.BinaryField.Value.O});
                 } else {
-//console.log("--- result = ELSE");
                                 varf2m;
                         var x, y;
                         var lambda;
                         var aX, aY, bX, bY;
                 
                         aX = aPointA.x()._value;
                         aY = aPointA.y()._value;
                         bX = aPointB.x()._value;
                         bY = aPointB.y()._value;
 
                         f2m = this.finiteField();
                         
                         if (aPointA.x().compare(aPointB.x()) != 0) {
-//console.log(" a.x != b.x");
                                         lambda =f2m._fastMultiply(
                                                                 f2m._add(aY, bY),
                                                                 f2m._inverse(f2m._add(aX, bX))
                                                         );
                                 x = f2m._add(this.a()._value, f2m._square(lambda));
                                 f2m._overwriteAdd(x, lambda);
                                 f2m._overwriteAdd(x, aX);
                                 f2m._overwriteAdd(x, bX);
                         } else {
-//console.log(" a.x == b.x");
                                 lambda = f2m._add(bX, f2m._fastMultiply(bY, f2m._inverse(bX)));
-//console.log(" lambda: " + lambda.asString(16));
                                 x = f2m._add(this.a()._value, f2m._square(lambda));
-//console.log(" x (step 1): " + x.asString(16));
                                 f2m._overwriteAdd(x, lambda);
-//console.log(" x (step 2): " + x.asString(16));
                         }
                         
                         y = f2m._fastMultiply(f2m._add(bX, x), lambda);
-//console.log(" y (step 1): " + y.asString(16));
                         f2m._overwriteAdd(y, x);
-//console.log(" y (step 2): " + y.asString(16));
                         f2m._overwriteAdd(y, bY);
-//console.log(" y (step 3): " + y.asString(16));
 
                         result = new Clipperz.Crypto.ECC.BinaryField.Point({x:new Clipperz.Crypto.ECC.BinaryField.Value(x), y:new Clipperz.Crypto.ECC.BinaryField.Value(y)})
                 }
-//console.log("<<< ECC.BinaryField.Curve.add");
                 
                 return result;
         },
 
         //-----------------------------------------------------------------------------
 
         'addTwice': function(aPointA) {
                 return this.add(aPointA, aPointA);
         },
         
         //-----------------------------------------------------------------------------
 
         'overwriteAdd': function(aPointA, aPointB) {
                 if (aPointA.isZero()) {
         //              result = aPointB;
                         aPointA._x._value = aPointB._x._value;
                         aPointA._y._value = aPointB._y._value;
                 } else if (aPointB.isZero()) {
         //              result = aPointA;
                         } else if ((aPointA.x().compare(aPointB.x()) == 0) && ((aPointA.y().compare(aPointB.y()) != 0) || aPointB.x().isZero())) {
         //              result = new Clipperz.Crypto.ECC.BinaryField.Point({x:Clipperz.Crypto.ECC.BinaryField.Value.O, y:Clipperz.Crypto.ECC.BinaryField.Value.O});
                         aPointA._x = Clipperz.Crypto.ECC.BinaryField.Value.O;
                         aPointA._y = Clipperz.Crypto.ECC.BinaryField.Value.O;
                 } else {
                                 varf2m;
                         var x, y;
                         var lambda;
                         var aX, aY, bX, bY;
                 
                         aX = aPointA.x()._value;
                         aY = aPointA.y()._value;
                         bX = aPointB.x()._value;
                         bY = aPointB.y()._value;
 
                         f2m = this.finiteField();
                         
                         if (aPointA.x().compare(aPointB.x()) != 0) {
-//console.log(" a.x != b.x");
                                         lambda =f2m._fastMultiply(
                                                                 f2m._add(aY, bY),
                                                                 f2m._inverse(f2m._add(aX, bX))
                                                         );
                                 x = f2m._add(this.a()._value, f2m._square(lambda));
                                 f2m._overwriteAdd(x, lambda);
                                 f2m._overwriteAdd(x, aX);
                                 f2m._overwriteAdd(x, bX);
                         } else {
-//console.log(" a.x == b.x");
                                 lambda = f2m._add(bX, f2m._fastMultiply(bY, f2m._inverse(bX)));
-//console.log(" lambda: " + lambda.asString(16));
                                 x = f2m._add(this.a()._value, f2m._square(lambda));
-//console.log(" x (step 1): " + x.asString(16));
                                 f2m._overwriteAdd(x, lambda);
-//console.log(" x (step 2): " + x.asString(16));
                         }
                         
                         y = f2m._fastMultiply(f2m._add(bX, x), lambda);
-//console.log(" y (step 1): " + y.asString(16));
                         f2m._overwriteAdd(y, x);
-//console.log(" y (step 2): " + y.asString(16));
                         f2m._overwriteAdd(y, bY);
-//console.log(" y (step 3): " + y.asString(16));
 
         //              result = new Clipperz.Crypto.ECC.BinaryField.Point({x:new Clipperz.Crypto.ECC.BinaryField.Value(x), y:new Clipperz.Crypto.ECC.BinaryField.Value(y)})
                         aPointA._x._value = x;
                         aPointA._y._value = y;
 
                 }
-//console.log("<<< ECC.BinaryField.Curve.add");
                 
                 return result;
         },
         
         //-----------------------------------------------------------------------------
 
         'multiply': function(aValue, aPoint) {
                 var result;
 
 //console.profile();
                 result = new Clipperz.Crypto.ECC.BinaryField.Point({x:Clipperz.Crypto.ECC.BinaryField.Value.O, y:Clipperz.Crypto.ECC.BinaryField.Value.O});
                 
                 if (aValue.isZero() == false) {
                         var k, Q;
                         var i;
                         var countIndex; countIndex = 0;
                         
                         if (aValue.compare(Clipperz.Crypto.ECC.BinaryField.Value.O) > 0) {
                                 k = aValue;
                                 Q = aPoint;
                         } else {
-MochiKit.Logging.logError("The Clipperz.Crypto.ECC.BinaryFields.Value does not work with negative values!!!!");
+                                Clipperz.logError("The Clipperz.Crypto.ECC.BinaryFields.Value does not work with negative values!!!!");
                                 k = aValue.negate();
                                 Q = this.negate(aPoint);
                         }
 
-//console.log("k: " + k.toString(16));
-//console.log("k.bitSize: " + k.bitSize());
                         for (i=k.bitSize()-1; i>=0; i--) {
                                 result = this.add(result, result);
         //                      this.overwriteAdd(result, result);
                                 if (k.isBitSet(i)) {
                                         result = this.add(result, Q);
         //                              this.overwriteAdd(result, Q);
                                 }
                                 
-        //                      if (countIndex==100) {console.log("multiply.break"); break;} else countIndex++;
+        //                      if (countIndex==100) {Clipperz.log("multiply.break"); break;} else countIndex++;
                         }
                 }
 //console.profileEnd();
                 
                 return result;
         },
 
         //-----------------------------------------------------------------------------
 
         'deferredMultiply': function(aValue, aPoint) {
                 var deferredResult;
                 var result;
 
-MochiKit.Logging.logDebug(">>> deferredMultiply - value: " + aValue + ", point: " + aPoint);
+Clipperz.log(">>> deferredMultiply - value: " + aValue + ", point: " + aPoint);
 //console.profile("ECC.Curve.multiply");
                 deferredResult = new MochiKit.Async.Deferred();
 //deferredResult.addCallback(function(res) {console.profile("ECC.Curve.deferredMultiply"); return res;} );
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("# 1: " + res); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("# 1: " + res); return res;});
                 
                 result = new Clipperz.Crypto.ECC.BinaryField.Point({x:Clipperz.Crypto.ECC.BinaryField.Value.O, y:Clipperz.Crypto.ECC.BinaryField.Value.O});
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("# 2: " + res); return res;});
+//deferredResult.addBoth(function(res) {Clipperz.logDebug("# 2: " + res); return res;});
 
                 if (aValue.isZero() == false) {
                         var k, Q;
                         var i;
                         var countIndex; countIndex = 0;
                         
                         if (aValue.compare(Clipperz.Crypto.ECC.BinaryField.Value.O) > 0) {
                                 k = aValue;
                                 Q = aPoint;
                         } else {
-MochiKit.Logging.logError("The Clipperz.Crypto.ECC.BinaryFields.Value does not work with negative values!!!!");
+                                Clipperz.logError("The Clipperz.Crypto.ECC.BinaryFields.Value does not work with negative values!!!!");
                                 k = aValue.negate();
                                 Q = this.negate(aPoint);
                         }
 
-//console.log("k: " + k.toString(16));
-//console.log("k.bitSize: " + k.bitSize());
 
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("# 3: " + res); return res;});
                         for (i=k.bitSize()-1; i>=0; i--) {
-//MochiKit.Logging.logDebug("====> " + i);
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("# 4 > i = " + i + ": " + res); return res;});
                                 deferredResult.addMethod(this, "addTwice");
         //#                     result = this.add(result, result);
         //                      this.overwriteAdd(result, result);
                                 if (k.isBitSet(i)) {
                                         deferredResult.addMethod(this, "add", Q);
         //#                             result = this.add(result, Q);
         //                              this.overwriteAdd(result, Q);
                                 }
                                 if (i%20 == 0) {deferredResult.addCallback(MochiKit.Async.wait, 0.1);}
-                                
-        //                      if (countIndex==100) {console.log("multiply.break"); break;} else countIndex++;
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("# 4 < i = " + i + ": " + res); return res;});
                         }
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("# 4: " + res); return res;});
                 }
 //#console.profileEnd();
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("# 5: " + res); return res;});
 //deferredResult.addBoth(function(res) {console.profileEnd(); return res;});
-//deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("# 6: " + res); return res;});
                 deferredResult.callback(result);
                 
         //#     return result;
                 return deferredResult;
         },
 
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
 
 
 //#############################################################################
 
 Clipperz.Crypto.ECC.StandardCurves = {};
 
 MochiKit.Base.update(Clipperz.Crypto.ECC.StandardCurves, {
 /*
         '_K571': null,
         'K571': function() {
                 if (Clipperz.Crypto.ECC.StandardCurves._K571 == null) {
                         Clipperz.Crypto.ECC.StandardCurves._K571 = new Clipperz.Crypto.ECC.BinaryField.Curve({
                                 modulus: new Clipperz.Crypto.ECC.BinaryField.Value('08000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000425', 16),
                                 a: new Clipperz.Crypto.ECC.BinaryField.Value('0', 16),
                                 b: new Clipperz.Crypto.ECC.BinaryField.Value('1', 16),
@@ -420,128 +378,123 @@ MochiKit.Base.update(Clipperz.Crypto.ECC.StandardCurves, {
                                 //      -------------------------------------------------------------------------
                                 //      
                                 //        Input:  Polynomial p(x) of degree 1140 or less, stored as 
                                 //                an array of 2T machinewords.
                                 //        Output: p(x) mod f571(x)
                                 //      
                                 //        FOR i = T-1, ..., 0 DO
                                 //            SET X  := P[i+T]
                                 //            P[i]   := P[i]   ^ (X<<5) ^ (X<<7) ^ (X<<10) ^ (X<<15)
                                 //            P[i+1] := P[i+1] ^ (X>>17) ^ (X>>22) ^ (X>>25) ^ (X>>27)
                                 //      
                                 //        SET X  := P[T-1] >> 27
                                 //        P[0]   := P[0] ^ X ^ (X<<2) ^ (X<<5) ^ (X<<10)
                                 //        P[T-1] := P[T-1] & 0x07ffffff
                                 //      
                                 //        RETURN P[T-1],...,P[0]
                                 //      
                                 //      -------------------------------------------------------------------------
                                 //      
                         Clipperz.Crypto.ECC.StandardCurves._B571.finiteField().slowModule = Clipperz.Crypto.ECC.StandardCurves._B571.finiteField().module;
                         Clipperz.Crypto.ECC.StandardCurves._B571.finiteField().module = function(aValue) {
                                         varresult;
                                 
                                 if (aValue.bitSize() > 1140) {
-                                        MochiKit.Logging.logWarning("ECC.StandarCurves.B571.finiteField().module: falling back to default implementation");
+                                        Clipperz.logWarning("ECC.StandarCurves.B571.finiteField().module: falling back to default implementation");
                                         result = Clipperz.Crypto.ECC.StandardCurves._B571.finiteField().slowModule(aValue);
                                 } else {
                                                 varC, T;
                                         var i;
                 
-//console.log(">>> binaryField.finiteField.(improved)module");
-        //                              C = aValue.value().slice(0);
                                         C = aValue._value.slice(0);
                                         for (i=35; i>=18; i--) {
                                                 T = C[i];
                                                 C[i-18] = (((C[i-18] ^ (T<<5) ^ (T<<7) ^ (T<<10) ^ (T<<15)) & 0xffffffff) >>> 0);
                                                 C[i-17] = ((C[i-17] ^ (T>>>27) ^ (T>>>25) ^ (T>>>22) ^ (T>>>17)) >>> 0);
                                         }
                                         T = (C[17] >>> 27);
                                         C[0] = ((C[0] ^ T ^ ((T<<2) ^ (T<<5) ^ (T<<10)) & 0xffffffff) >>> 0);
                                         C[17] = (C[17] & 0x07ffffff);
 
                                         for(i=18; i<=35; i++) {
                                                 C[i] = 0;
                                         }
                                 
                                         result = new Clipperz.Crypto.ECC.BinaryField.Value(C);
-//console.log("<<< binaryField.finiteField.(improved)module");
                                 }
                         
                                 return result;
                         };
                 }
                 
                 return Clipperz.Crypto.ECC.StandardCurves._B571;
         },
 
         //-----------------------------------------------------------------------------
 
         '_B283': null,
                 'B283': function() {    //f(z) = z^283 + z^12 + z^7 + z^5 + 1
                 if (Clipperz.Crypto.ECC.StandardCurves._B283 == null) {
                         Clipperz.Crypto.ECC.StandardCurves._B283 = new Clipperz.Crypto.ECC.BinaryField.Curve({
         //                      modulus: new Clipperz.Crypto.ECC.BinaryField.Value('10000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 000010a1', 16),
                                 modulus: new Clipperz.Crypto.ECC.BinaryField.Value('08000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 000010a1', 16),
                                 a: new Clipperz.Crypto.ECC.BinaryField.Value('1', 16),
                                 b: new Clipperz.Crypto.ECC.BinaryField.Value('027b680a c8b8596d a5a4af8a 19a0303f ca97fd76 45309fa2 a581485a f6263e31 3b79a2f5', 16),
                                 G: new Clipperz.Crypto.ECC.BinaryField.Point({
                                         x: new Clipperz.Crypto.ECC.BinaryField.Value('05f93925 8db7dd90 e1934f8c 70b0dfec 2eed25b8 557eac9c 80e2e198 f8cdbecd 86b12053', 16),
                                         y: new Clipperz.Crypto.ECC.BinaryField.Value('03676854 fe24141c b98fe6d4 b20d02b4 516ff702 350eddb0 826779c8 13f0df45 be8112f4', 16)
                                 }),
                                 r: new Clipperz.Crypto.ECC.BinaryField.Value('03ffffff ffffffff ffffffff ffffffff ffffef90 399660fc 938a9016 5b042a7c efadb307', 16),
                                 h: new Clipperz.Crypto.ECC.BinaryField.Value('2', 16)
 
         //                      S: new Clipperz.Crypto.ECC.BinaryField.Value('2aa058f73a0e33ab486b0f610410c53a7f132310', 10),
         //                      n: new Clipperz.Crypto.ECC.BinaryField.Value('03ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe661ce18ff55987308059b186823851ec7dd9ca1161de93d5174d66e8382e9bb2fe84e47', 16)
                         });
                         
                         //-----------------------------------------------------------------------------
                         //
                                 //Guide to Elliptic Curve Cryptography
                                 //Darrel Hankerson, Alfred Menezes, Scott Vanstone
                                 //- Pag: 56, Alorithm 2.43
                                 //
                         //-----------------------------------------------------------------------------
                         Clipperz.Crypto.ECC.StandardCurves._B283.finiteField().slowModule = Clipperz.Crypto.ECC.StandardCurves._B283.finiteField().module;
                         Clipperz.Crypto.ECC.StandardCurves._B283.finiteField().module = function(aValue) {
                                         varresult;
 
                                 if (aValue.bitSize() > 564) {
-                                        MochiKit.Logging.logWarning("ECC.StandarCurves.B283.finiteField().module: falling back to default implementation");
+                                        Clipperz.logWarning("ECC.StandarCurves.B283.finiteField().module: falling back to default implementation");
                                         result = Clipperz.Crypto.ECC.StandardCurves._B283.finiteField().slowModule(aValue);
                                 } else {
                                                 varC, T;
                                         var i;
                                         
-//console.log(">>> binaryField.finiteField.(improved)module");
                                         C = aValue._value.slice(0);
                                         for (i=17; i>=9; i--) {
                                                 T = C[i];
                                                 C[i-9] = (((C[i-9] ^ (T<<5) ^ (T<<10) ^ (T<<12) ^ (T<<17)) & 0xffffffff) >>> 0);
                                                 C[i-8] = ((C[i-8] ^ (T>>>27) ^ (T>>>22) ^ (T>>>20) ^ (T>>>15)) >>> 0);
                                         }
                                         T = (C[8] >>> 27);
                                         C[0] = ((C[0] ^ T ^ ((T<<5) ^ (T<<7) ^ (T<<12)) & 0xffffffff) >>> 0);
                                         C[8] = (C[8] & 0x07ffffff);
 
                                         for(i=9; i<=17; i++) {
                                                 C[i] = 0;
                                         }
                                 
                                         result = new Clipperz.Crypto.ECC.BinaryField.Value(C);
-//console.log("<<< binaryField.finiteField.(improved)module");
                                 }
                                 
                                 return result;
                         };
                 }
                 
                 return Clipperz.Crypto.ECC.StandardCurves._B283;
         },
 
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });
 
 //#############################################################################
 
diff --git a/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/FiniteField.js b/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/FiniteField.js
index 56f257a..7b7c2c6 100644
--- a/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/FiniteField.js
+++ b/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/FiniteField.js
@@ -1,102 +1,98 @@
 /*
 
-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.ByteArray) == 'undefined') { throw ""; }} catch (e) {
         //throw "Clipperz.Crypto.ECC depends on Clipperz.ByteArray!";
 //}  
 if (typeof(Clipperz.Crypto.ECC) == 'undefined') { Clipperz.Crypto.ECC = {}; }
 if (typeof(Clipperz.Crypto.ECC.BinaryField) == 'undefined') { Clipperz.Crypto.ECC.BinaryField = {}; }
 
 Clipperz.Crypto.ECC.BinaryField.FiniteField = function(args) {
         args = args || {};
         this._modulus = args.modulus;
 
         return this;
 }
 
 Clipperz.Crypto.ECC.BinaryField.FiniteField.prototype = MochiKit.Base.update(null, {
 
         'asString': function() {
                 return "Clipperz.Crypto.ECC.BinaryField.FiniteField (" + this.modulus().asString() + ")";
         },
 
         //-----------------------------------------------------------------------------
 
         'modulus': function() {
                 return this._modulus;
         },
         
         //-----------------------------------------------------------------------------
 
         '_module': function(aValue) {
                         varresult;
                 var modulusComparison;
-//console.log(">>> binaryField.finiteField.(standard)module");
                 
                 modulusComparison = Clipperz.Crypto.ECC.BinaryField.Value._compare(aValue, this.modulus()._value);
 
                 if (modulusComparison < 0) {
                         result = aValue;
                 } else if (modulusComparison == 0) {
                         result = [0];
                 } else {
                         var modulusBitSize;
                         var resultBitSize;
                         
                         result = aValue;
 
                         modulusBitSize = this.modulus().bitSize();
                         resultBitSize = Clipperz.Crypto.ECC.BinaryField.Value._bitSize(result);
                         while (resultBitSize >= modulusBitSize) {
                                 Clipperz.Crypto.ECC.BinaryField.Value._overwriteXor(result, Clipperz.Crypto.ECC.BinaryField.Value._shiftLeft(this.modulus()._value, resultBitSize - modulusBitSize));
                                 resultBitSize = Clipperz.Crypto.ECC.BinaryField.Value._bitSize(result);
                         }
                 }
-//console.log("<<< binaryField.finiteField.(standard)module");
-                
+
                 return result;
         },
         
         'module': function(aValue) {
                 return new Clipperz.Crypto.ECC.BinaryField.Value(this._module(aValue._value.slice(0)));
         },
         
         //-----------------------------------------------------------------------------
 
         '_add': function(a, b) {
                 return Clipperz.Crypto.ECC.BinaryField.Value._xor(a, b);
         },
 
         '_overwriteAdd': function(a, b) {
                 Clipperz.Crypto.ECC.BinaryField.Value._overwriteXor(a, b);
         },
         
         'add': function(a, b) {
                 return new Clipperz.Crypto.ECC.BinaryField.Value(this._add(a._value, b._value));
         },
         
         //-----------------------------------------------------------------------------
 
         'negate': function(aValue) {
diff --git a/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Point.js b/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Point.js
index ffe287b..fef3220 100644
--- a/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Point.js
+++ b/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Point.js
@@ -1,46 +1,44 @@
 /*
 
-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.ByteArray) == 'undefined') { throw ""; }} catch (e) {
         //throw "Clipperz.Crypto.ECC depends on Clipperz.ByteArray!";
 //}  
 if (typeof(Clipperz.Crypto.ECC) == 'undefined') { Clipperz.Crypto.ECC = {}; }
 if (typeof(Clipperz.Crypto.ECC.BinaryField) == 'undefined') { Clipperz.Crypto.ECC.BinaryField = {}; }
 
 Clipperz.Crypto.ECC.BinaryField.Point = function(args) {
         args = args || {};
         this._x = args.x;
         this._y = args.y;
         
         return this;
 }
 
 Clipperz.Crypto.ECC.BinaryField.Point.prototype = MochiKit.Base.update(null, {
 
         'asString': function() {
                 return "Clipperz.Crypto.ECC.BinaryField.Point (" + this.x() + ", " + this.y() + ")";
         },
 
         //-----------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Value.js b/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Value.js
index b705a20..634772a 100644
--- a/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Value.js
+++ b/frontend/gamma/js/Clipperz/Crypto/ECC/BinaryField/Value.js
@@ -1,46 +1,44 @@
 /*
 
-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.ByteArray) == 'undefined') { throw ""; }} catch (e) {
         //throw "Clipperz.Crypto.ECC depends on Clipperz.ByteArray!";
 //}  
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.Crypto) == 'undefined') { Clipperz.Crypto = {}; }
 if (typeof(Clipperz.Crypto.ECC) == 'undefined') { Clipperz.Crypto.ECC = {}; }
 if (typeof(Clipperz.Crypto.ECC.BinaryField) == 'undefined') { Clipperz.Crypto.ECC.BinaryField = {}; }
 
 Clipperz.Crypto.ECC.BinaryField.Value = function(aValue, aBase, aBitSize) {
         if (aValue.constructor == String) {
                         varvalue;
                         varstringLength;
                 var numberOfWords;
                         vari,c;
         
                 if (aBase != 16) {
                         throw Clipperz.Crypto.ECC.BinaryField.Value.exception.UnsupportedBase;
                 }
 
                 value = aValue.replace(/ /g, '');
                 stringLength = value.length;
@@ -347,37 +345,35 @@ Clipperz.Crypto.ECC.BinaryField.Value._isBitSet = function(aWordArray, aBitPosit
         var result;
                 varbyteIndex;
         var bitIndexInSelectedByte;
 
         byteIndex = Math.floor(aBitPosition / 32);
         bitIndexInSelectedByte = aBitPosition % 32;
         
         if (byteIndex <= aWordArray.length) {
                 result = ((aWordArray[byteIndex] & (1 << bitIndexInSelectedByte)) != 0);
         } else {
                 result = false;
         }
 
         return result;
 };
 
 Clipperz.Crypto.ECC.BinaryField.Value._compare = function(a,b) {
                 varresult;
         var i,c;
         
         result = MochiKit.Base.compare(a.length, b.length);
 
         c = a.length;
         for (i=0; (i<c) && (result==0); i++) {
-//console.log("compare[" + c + " - " + i + " - 1] " + this.value()[c-i-1] + ", " + aValue.value()[c-i-1]);
-        //      result = MochiKit.Base.compare(this.value()[c-i-1], aValue.value()[c-i-1]);
                 result = MochiKit.Base.compare(a[c-i-1], b[c-i-1]);
         }
         
         return result;
 };
 
 
 Clipperz.Crypto.ECC.BinaryField.Value['exception']= {
                 'UnsupportedBase':                              new MochiKit.Base.NamedError("Clipperz.Crypto.ECC.BinaryField.Value.exception.UnsupportedBase"),
                 'UnsupportedConstructorValueType':new MochiKit.Base.NamedError("Clipperz.Crypto.ECC.BinaryField.Value.exception.UnsupportedConstructorValueType")
 };
diff --git a/frontend/gamma/js/Clipperz/Crypto/ECC/StandardCurves.js b/frontend/gamma/js/Clipperz/Crypto/ECC/StandardCurves.js
index be197e3..239e264 100644
--- a/frontend/gamma/js/Clipperz/Crypto/ECC/StandardCurves.js
+++ b/frontend/gamma/js/Clipperz/Crypto/ECC/StandardCurves.js
@@ -1,46 +1,44 @@
 /*
 
-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.Crypto.ECC.BinaryField.Curve) == 'undefined') { throw ""; }} catch (e) {
         //throw "Clipperz.Crypto.ECC depends on Clipperz.Crypto.ECC.BinaryField.Curve!";
 //}
 //try { if (typeof(Clipperz.Crypto.ECC.Koblitz.Curve) == 'undefined') { throw ""; }} catch (e) {
         //throw "Clipperz.Crypto.ECC depends on Clipperz.Crypto.ECC.Koblitz.Curve!";
 //}
 
 Clipperz.Crypto.ECC.StandardCurves = {};
 
 MochiKit.Base.update(Clipperz.Crypto.ECC.StandardCurves, {
 
         //==============================================================================
 
         '_K571': null,
                 'K571': function() {    //f(z) = z^571 + z^10 + z^5 + z^2 + 1
                 if ((Clipperz.Crypto.ECC.StandardCurves._K571 == null) && (typeof(Clipperz.Crypto.ECC.Koblitz.Curve) != 'undefined')) {
                         Clipperz.Crypto.ECC.StandardCurves._K571 = new Clipperz.Crypto.ECC.Koblitz.Curve({
                                 modulus: new Clipperz.Crypto.ECC.Koblitz.Value('08000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000425', 16),
                                 a: new Clipperz.Crypto.ECC.Koblitz.Value('0', 16),
                                 b: new Clipperz.Crypto.ECC.Koblitz.Value('1', 16),
                                 G: new Clipperz.Crypto.ECC.Koblitz.Point({
@@ -113,124 +111,119 @@ MochiKit.Base.update(Clipperz.Crypto.ECC.StandardCurves, {
                                 //      -------------------------------------------------------------------------
                                 //      
                                 //        Input:  Polynomial p(x) of degree 1140 or less, stored as 
                                 //                an array of 2T machinewords.
                                 //        Output: p(x) mod f571(x)
                                 //      
                                 //        FOR i = T-1, ..., 0 DO
                                 //            SET X  := P[i+T]
                                 //            P[i]   := P[i]   ^ (X<<5) ^ (X<<7) ^ (X<<10) ^ (X<<15)
                                 //            P[i+1] := P[i+1] ^ (X>>17) ^ (X>>22) ^ (X>>25) ^ (X>>27)
                                 //      
                                 //        SET X  := P[T-1] >> 27
                                 //        P[0]   := P[0] ^ X ^ (X<<2) ^ (X<<5) ^ (X<<10)
                                 //        P[T-1] := P[T-1] & 0x07ffffff
                                 //      
                                 //        RETURN P[T-1],...,P[0]
                                 //      
                                 //      -------------------------------------------------------------------------
                                 //      
                         Clipperz.Crypto.ECC.StandardCurves._B571.finiteField().slowModule = Clipperz.Crypto.ECC.StandardCurves._B571.finiteField().module;
                         Clipperz.Crypto.ECC.StandardCurves._B571.finiteField().module = function(aValue) {
                                         varresult;
                                 
                                 if (aValue.bitSize() > 1140) {
-                                        MochiKit.Logging.logWarning("ECC.StandarCurves.B571.finiteField().module: falling back to default implementation");
+                                        Clipperz.logWarning("ECC.StandarCurves.B571.finiteField().module: falling back to default implementation");
                                         result = Clipperz.Crypto.ECC.StandardCurves._B571.finiteField().slowModule(aValue);
                                 } else {
                                                 varC, T;
                                         var i;
                 
-//console.log(">>> binaryField.finiteField.(improved)module");
-        //                              C = aValue.value().slice(0);
                                         C = aValue._value.slice(0);
                                         for (i=35; i>=18; i--) {
                                                 T = C[i];
                                                 C[i-18] = (((C[i-18] ^ (T<<5) ^ (T<<7) ^ (T<<10) ^ (T<<15)) & 0xffffffff) >>> 0);
                                                 C[i-17] = ((C[i-17] ^ (T>>>27) ^ (T>>>25) ^ (T>>>22) ^ (T>>>17)) >>> 0);
                                         }
                                         T = (C[17] >>> 27);
                                         C[0] = ((C[0] ^ T ^ ((T<<2) ^ (T<<5) ^ (T<<10)) & 0xffffffff) >>> 0);
                                         C[17] = (C[17] & 0x07ffffff);
 
                                         for(i=18; i<=35; i++) {
                                                 C[i] = 0;
                                         }
                                 
                                         result = new Clipperz.Crypto.ECC.BinaryField.Value(C);
-//console.log("<<< binaryField.finiteField.(improved)module");
                                 }
                         
                                 return result;
                         };
                 }
                 
                 return Clipperz.Crypto.ECC.StandardCurves._B571;
         },
 
         //-----------------------------------------------------------------------------
 
         '_B283': null,
                 'B283': function() {    //f(z) = z^283 + z^12 + z^7 + z^5 + 1
                 if ((Clipperz.Crypto.ECC.StandardCurves._B283 == null) && (typeof(Clipperz.Crypto.ECC.BinaryField.Curve) != 'undefined')) {
                         Clipperz.Crypto.ECC.StandardCurves._B283 = new Clipperz.Crypto.ECC.BinaryField.Curve({
                                 modulus: new Clipperz.Crypto.ECC.BinaryField.Value('08000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 000010a1', 16),
                                 a: new Clipperz.Crypto.ECC.BinaryField.Value('1', 16),
                                 b: new Clipperz.Crypto.ECC.BinaryField.Value('027b680a c8b8596d a5a4af8a 19a0303f ca97fd76 45309fa2 a581485a f6263e31 3b79a2f5', 16),
                                 G: new Clipperz.Crypto.ECC.BinaryField.Point({
                                         x: new Clipperz.Crypto.ECC.BinaryField.Value('05f93925 8db7dd90 e1934f8c 70b0dfec 2eed25b8 557eac9c 80e2e198 f8cdbecd 86b12053', 16),
                                         y: new Clipperz.Crypto.ECC.BinaryField.Value('03676854 fe24141c b98fe6d4 b20d02b4 516ff702 350eddb0 826779c8 13f0df45 be8112f4', 16)
                                 }),
                                 r: new Clipperz.Crypto.ECC.BinaryField.Value('03ffffff ffffffff ffffffff ffffffff ffffef90 399660fc 938a9016 5b042a7c efadb307', 16),
                                 h: new Clipperz.Crypto.ECC.BinaryField.Value('2', 16)
                         });
                         
                         //-----------------------------------------------------------------------------
                         //
                                 //Guide to Elliptic Curve Cryptography
                                 //Darrel Hankerson, Alfred Menezes, Scott Vanstone
                                 //- Pag: 56, Alorithm 2.43
                                 //
                         //-----------------------------------------------------------------------------
                         Clipperz.Crypto.ECC.StandardCurves._B283.finiteField().slowModule = Clipperz.Crypto.ECC.StandardCurves._B283.finiteField().module;
                         Clipperz.Crypto.ECC.StandardCurves._B283.finiteField().module = function(aValue) {
                                         varresult;
 
                                 if (aValue.bitSize() > 564) {
-                                        MochiKit.Logging.logWarning("ECC.StandarCurves.B283.finiteField().module: falling back to default implementation");
+                                        Clipperz.logWarning("ECC.StandarCurves.B283.finiteField().module: falling back to default implementation");
                                         result = Clipperz.Crypto.ECC.StandardCurves._B283.finiteField().slowModule(aValue);
                                 } else {
                                                 varC, T;
                                         var i;
                                         
-//console.log(">>> binaryField.finiteField.(improved)module");
                                         C = aValue._value.slice(0);
                                         for (i=17; i>=9; i--) {
                                                 T = C[i];
                                                 C[i-9] = (((C[i-9] ^ (T<<5) ^ (T<<10) ^ (T<<12) ^ (T<<17)) & 0xffffffff) >>> 0);
                                                 C[i-8] = ((C[i-8] ^ (T>>>27) ^ (T>>>22) ^ (T>>>20) ^ (T>>>15)) >>> 0);
                                         }
                                         T = (C[8] >>> 27);
                                         C[0] = ((C[0] ^ T ^ ((T<<5) ^ (T<<7) ^ (T<<12)) & 0xffffffff) >>> 0);
                                         C[8] = (C[8] & 0x07ffffff);
 
                                         for(i=9; i<=17; i++) {
                                                 C[i] = 0;
                                         }
                                 
                                         result = new Clipperz.Crypto.ECC.BinaryField.Value(C);
-//console.log("<<< binaryField.finiteField.(improved)module");
                                 }
                                 
                                 return result;
                         };
                 }
                 
                 return Clipperz.Crypto.ECC.StandardCurves._B283;
         },
 
         //==============================================================================
         __syntaxFix__: "syntax fix"
 });
 
 
 
diff --git a/frontend/gamma/js/Clipperz/Crypto/PRNG.js b/frontend/gamma/js/Clipperz/Crypto/PRNG.js
index adfdb16..c539f06 100644
--- a/frontend/gamma/js/Clipperz/Crypto/PRNG.js
+++ b/frontend/gamma/js/Clipperz/Crypto/PRNG.js
@@ -1,46 +1,44 @@
 /*
 
-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.ByteArray) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.PRNG depends on Clipperz.ByteArray!";
 }  
 
 try { if (typeof(Clipperz.Crypto.SHA) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.PRNG depends on Clipperz.Crypto.SHA!";
 }  
 
 try { if (typeof(Clipperz.Crypto.AES) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.PRNG depends on Clipperz.Crypto.AES!";
 }  
 
 if (typeof(Clipperz.Crypto.PRNG) == 'undefined') { Clipperz.Crypto.PRNG = {}; }
 
 //#############################################################################
 
 Clipperz.Crypto.PRNG.EntropyAccumulator = function(args) {
         args = args || {};
         //MochiKit.Base.bindMethods(this);
 
         this._stack = new Clipperz.ByteArray();
@@ -468,49 +466,48 @@ Clipperz.Crypto.PRNG.Fortuna.prototype = MochiKit.Base.update(null, {
                 var i, c;
                 
                 newKeySeed = this.key();
                 this.incrementReseedCounter();
                 reseedCounter = this.reseedCounter();
                 
                 c = this.numberOfEntropyAccumulators();
                 reseedCounterMask = 0xffffffff >>> (32 - c);
                 for (i=0; i<c; i++) {
                         if ((i == 0) || ((reseedCounter & (reseedCounterMask >>> (c - i))) == 0)) {
                                 newKeySeed.appendBlock(this.accumulators()[i].stack());
                                 this.accumulators()[i].resetStack();
                         } 
                 }
                 
                 if (reseedCounter == 1) {
                         c = this.randomnessSources().length;
                         for (i=0; i<c; i++) {
                                 this.randomnessSources()[i].setBoostMode(false);
                         }
                 }
                 
                 this.setKey(Clipperz.Crypto.SHA.sha_d256(newKeySeed));
                 if (reseedCounter == 1) {
-//MochiKit.Logging.logDebug("### PRNG.readyToGenerateRandomBytes");
 Clipperz.log("### PRNG.readyToGenerateRandomBytes");
                         MochiKit.Signal.signal(this, 'readyToGenerateRandomBytes');
                 }
                 MochiKit.Signal.signal(this, 'reseeded');
         },
         
         //-------------------------------------------------------------------------
 
         'isReadyToGenerateRandomValues': function() {
                 return this.reseedCounter() != 0;
         },
         
         //-------------------------------------------------------------------------
 
         'entropyLevel': function() {
                 return this.accumulators()[0].stack().length() + (this.reseedCounter() * this.firstPoolReseedLevel());
         },
         
         //-------------------------------------------------------------------------
 
         'counter': function() {
                 return this._counter;
         },
         
@@ -539,49 +536,49 @@ Clipperz.log("### PRNG.readyToGenerateRandomBytes");
         
         //-------------------------------------------------------------------------
 
         'getRandomBytes': function(aSize) {
                 var result;
 
                 if (this.isReadyToGenerateRandomValues()) {
                         var i,c;
                         var newKey;
                         
                         result = new Clipperz.ByteArray();
                 
                         c = Math.ceil(aSize / (128 / 8));
                         for (i=0; i<c; i++) {
                                 result.appendBlock(this.getRandomBlock());
                         }
 
                         if (result.length() != aSize) {
                                 result = result.split(0, aSize);
                         }
                         
                         newKey = this.getRandomBlock().appendBlock(this.getRandomBlock());
                         this.setKey(newKey);
                 } else {
-MochiKit.Logging.logWarning("Fortuna generator has not enough entropy, yet!");
+Clipperz.logWarning("Fortuna generator has not enough entropy, yet!");
                         throw Clipperz.Crypto.PRNG.exception.NotEnoughEntropy;
                 }
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'addRandomByte': function(aSourceId, aPoolId, aRandomValue) {
                         varselectedAccumulator;
 
                 selectedAccumulator = this.accumulators()[aPoolId];
                 selectedAccumulator.addRandomByte(aRandomValue);
 
                 if (aPoolId == 0) {
                         MochiKit.Signal.signal(this, 'addedRandomByte')
                         if (selectedAccumulator.stack().length() > this.firstPoolReseedLevel()) {
                                 this.reseed();
                         }
                 }
         },
 
         //-------------------------------------------------------------------------
         
@@ -589,71 +586,63 @@ MochiKit.Logging.logWarning("Fortuna generator has not enough entropy, yet!");
                 return this._numberOfEntropyAccumulators;
         },
 
         //-------------------------------------------------------------------------
 
         'randomnessSources': function() {
                 return this._randomnessSources;
         },
         
         'addRandomnessSource': function(aRandomnessSource) {
                 aRandomnessSource.setGenerator(this);
                 aRandomnessSource.setSourceId(this.randomnessSources().length);
                 this.randomnessSources().push(aRandomnessSource);
                 
                 if (this.isReadyToGenerateRandomValues() == false) {
                         aRandomnessSource.setBoostMode(true);
                 }
         },
 
         //-------------------------------------------------------------------------
 
         'deferredEntropyCollection': function(aValue) {
                 var result;
 
-//MochiKit.Logging.logDebug(">>> PRNG.deferredEntropyCollection");
 
                 if (this.isReadyToGenerateRandomValues()) {
-//MochiKit.Logging.logDebug("--- PRNG.deferredEntropyCollection - 1");
                         result = aValue;
                 } else {
-//MochiKit.Logging.logDebug("--- PRNG.deferredEntropyCollection - 2");
                         var deferredResult;
 
-        //              Clipperz.NotificationCenter.notify(this, 'updatedProgressState', 'collectingEntropy', true);
-
                         deferredResult = new Clipperz.Async.Deferred("PRNG.deferredEntropyCollection");
-        //              deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("1.2.1 - PRNG.deferredEntropyCollection - 1: " + res); return res;});
                         deferredResult.addCallback(MochiKit.Base.partial(MochiKit.Async.succeed, aValue));
-        //              deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("1.2.2 - PRNG.deferredEntropyCollection - 2: " + res); return res;});
                         MochiKit.Signal.connect(this,
                                                                         'readyToGenerateRandomBytes',
                                                                         deferredResult,
                                                                         'callback');
                                                                         
                         result = deferredResult;
                 }
-//MochiKit.Logging.logDebug("<<< PRNG.deferredEntropyCollection - result: " + result);
 
                 return result;
         },
         
         //-------------------------------------------------------------------------
 
         'fastEntropyAccumulationForTestingPurpose': function() {
                 while (! this.isReadyToGenerateRandomValues()) {
                         this.addRandomByte(Math.floor(Math.random() * 32), Math.floor(Math.random() * 32), Math.floor(Math.random() * 256));
                 }
         },
         
         //-------------------------------------------------------------------------
 
         'dump': function(appendToDoc) {
                 var tbl;
                 var i,c;
                 
                 tbl = document.createElement("table");
                 tbl.border = 0;
                 with (tbl.style) {
                         border = "1px solid lightgrey";
                         fontFamily = 'Helvetica, Arial, sans-serif';
                         fontSize = '8pt';
diff --git a/frontend/gamma/js/Clipperz/Crypto/RSA.js b/frontend/gamma/js/Clipperz/Crypto/RSA.js
index 6844dba..5a480f1 100644
--- a/frontend/gamma/js/Clipperz/Crypto/RSA.js
+++ b/frontend/gamma/js/Clipperz/Crypto/RSA.js
@@ -1,46 +1,44 @@
 /*
 
-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.Crypto.BigInt) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.RSA depends on Clipperz.Crypto.BigInt!";
 }  
 
 if (typeof(Clipperz.Crypto.RSA) == 'undefined') { Clipperz.Crypto.RSA = {}; }
 
 Clipperz.Crypto.RSA.VERSION = "0.1";
 Clipperz.Crypto.RSA.NAME = "Clipperz.RSA";
 
 //#############################################################################
 
 MochiKit.Base.update(Clipperz.Crypto.RSA, {
 
         //-------------------------------------------------------------------------
 
         'publicKeyWithValues': function (e, d, n) {
                         varresult;
                 
                 result = {};
 
                 if (e.isBigInt) {
diff --git a/frontend/gamma/js/Clipperz/Crypto/SHA.js b/frontend/gamma/js/Clipperz/Crypto/SHA.js
index b07fa85..f8bfe6e 100644
--- a/frontend/gamma/js/Clipperz/Crypto/SHA.js
+++ b/frontend/gamma/js/Clipperz/Crypto/SHA.js
@@ -1,46 +1,44 @@
 /*
 
-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.ByteArray) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.PRNG depends on Clipperz.ByteArray!";
 }  
 
 if (typeof(Clipperz.Crypto) == 'undefined') { Clipperz.Crypto = {}; }
 if (typeof(Clipperz.Crypto.SHA) == 'undefined') { Clipperz.Crypto.SHA = {}; }
 
 Clipperz.Crypto.SHA.VERSION = "0.3";
 Clipperz.Crypto.SHA.NAME = "Clipperz.Crypto.SHA";
 
 MochiKit.Base.update(Clipperz.Crypto.SHA, {
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-----------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/Crypto/SRP.js b/frontend/gamma/js/Clipperz/Crypto/SRP.js
index 3b25275..597e72d 100644
--- a/frontend/gamma/js/Clipperz/Crypto/SRP.js
+++ b/frontend/gamma/js/Clipperz/Crypto/SRP.js
@@ -1,46 +1,44 @@
 /*
 
-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.ByteArray) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.PRNG depends on Clipperz.ByteArray!";
 }  
 
 try { if (typeof(Clipperz.Crypto.BigInt) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.SRP depends on Clipperz.Crypto.BigInt!";
 }  
 
 try { if (typeof(Clipperz.Crypto.PRNG) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.SRP depends on Clipperz.Crypto.PRNG!";
 }  
 
 if (typeof(Clipperz.Crypto.SRP) == 'undefined') { Clipperz.Crypto.SRP = {}; }
 
 Clipperz.Crypto.SRP.VERSION = "0.1";
 Clipperz.Crypto.SRP.NAME = "Clipperz.Crypto.SRP";
 
 //#############################################################################
 
 MochiKit.Base.update(Clipperz.Crypto.SRP, {
 
@@ -110,170 +108,160 @@ Clipperz.Crypto.SRP.Connection = function (args) {
 Clipperz.Crypto.SRP.Connection.prototype = MochiKit.Base.update(null, {
 
         'toString': function () {
                 return "Clipperz.Crypto.SRP.Connection (username: " + this.username() + "). Status: " + this.statusDescription();
         },
 
         //-------------------------------------------------------------------------
 
         'C': function () {
                 return this._C;
         },
 
         //-------------------------------------------------------------------------
 
         'P': function () {
                 return this._P;
         },
 
         //-------------------------------------------------------------------------
 
         'a': function () {
                 if (this._a == null) {
                         this._a = new Clipperz.Crypto.BigInt(Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(32).toHexString().substring(2), 16);
         //              this._a = new Clipperz.Crypto.BigInt("37532428169486597638072888476611365392249575518156687476805936694442691012367", 10);
-//MochiKit.Logging.logDebug("SRP a: " + this._a);
                 }
                 
                 return this._a;
         },
 
         //-------------------------------------------------------------------------
 
         'A': function () {
                 if (this._A == null) {
                                 //Warning: this value should be strictly greater than zero: how should we perform this check?
                         this._A = Clipperz.Crypto.SRP.g().powerModule(this.a(), Clipperz.Crypto.SRP.n());
                         
                         if (this._A.equals(0)) {
-MochiKit.Logging.logError("Clipperz.Crypto.SRP.Connection: trying to set 'A' to 0.");
+                                Clipperz.logError("Clipperz.Crypto.SRP.Connection: trying to set 'A' to 0.");
                                 throw Clipperz.Crypto.SRP.exception.InvalidValue;
                         }
-//MochiKit.Logging.logDebug("SRP A: " + this._A);
                 }
                 
                 return this._A;
         },
 
         //-------------------------------------------------------------------------
 
         's': function () {
                 return this._s;
-//MochiKit.Logging.logDebug("SRP s: " + this._S);
         },
 
         'set_s': function(aValue) {
                 this._s = aValue;
         },
         
         //-------------------------------------------------------------------------
 
         'B': function () {
                 return this._B;
         },
 
         'set_B': function(aValue) {
                         //Warning: this value should be strictly greater than zero: how should we perform this check?
                 if (! aValue.equals(0)) {
                         this._B = aValue;
-//MochiKit.Logging.logDebug("SRP B: " + this._B);
                 } else {
-MochiKit.Logging.logError("Clipperz.Crypto.SRP.Connection: trying to set 'B' to 0.");
+                        Clipperz.logError("Clipperz.Crypto.SRP.Connection: trying to set 'B' to 0.");
                         throw Clipperz.Crypto.SRP.exception.InvalidValue;
                 }
         },
         
         //-------------------------------------------------------------------------
 
         'x': function () {
                 if (this._x == null) {
                         this._x = new Clipperz.Crypto.BigInt(this.stringHash(this.s().asString(16, 64) + this.P()), 16);
-//MochiKit.Logging.logDebug("SRP x: " + this._x);
                 }
                 
                 return this._x;
         },
 
         //-------------------------------------------------------------------------
 
         'u': function () {
                 if (this._u == null) {
                         this._u = new Clipperz.Crypto.BigInt(this.stringHash(this.B().asString()), 16);
-//MochiKit.Logging.logDebug("SRP u: " + this._u);
                 }
                 
                 return this._u;
         },
 
         //-------------------------------------------------------------------------
 
         'S': function () {
                 if (this._S == null) {
                         var bigint;
                                 varsrp;
 
                         bigint = Clipperz.Crypto.BigInt;
                                 srp =  Clipperz.Crypto.SRP;
 
                                 this._S =bigint.powerModule(
                                                                 bigint.subtract(this.B(), bigint.powerModule(srp.g(), this.x(), srp.n())),
                                                                 bigint.add(this.a(), bigint.multiply(this.u(), this.x())),
                                                                 srp.n()
                                                 )
-//MochiKit.Logging.logDebug("SRP S: " + this._S);
                 }
                 
                 return this._S;
         },
 
         //-------------------------------------------------------------------------
 
         'K': function () {
                 if (this._K == null) {
                         this._K = this.stringHash(this.S().asString());
-//MochiKit.Logging.logDebug("SRP K: " + this._K);
                 }
                 
                 return this._K;
         },
 
         //-------------------------------------------------------------------------
 
         'M1': function () {
                 if (this._M1 == null) {
                         this._M1 = this.stringHash(this.A().asString(10) + this.B().asString(10) + this.K());
-//MochiKit.Logging.logDebug("SRP M1: " + this._M1);
                 }
                 
                 return this._M1;
         },
 
         //-------------------------------------------------------------------------
 
         'M2': function () {
                 if (this._M2 == null) {
                         this._M2 = this.stringHash(this.A().asString(10) + this.M1() + this.K());
-//MochiKit.Logging.logDebug("SRP M2: " + this._M2);
                 }
                 
                 return this._M2;
         },
 
         //=========================================================================
 
         'serverSideCredentialsWithSalt': function(aSalt) {
                 var result;
                 var s, x, v;
                 
                 s = aSalt;
                 x = this.stringHash(s + this.P());
                 v = Clipperz.Crypto.SRP.g().powerModule(new Clipperz.Crypto.BigInt(x, 16), Clipperz.Crypto.SRP.n());
 
                 result = {};
                 result['C'] = this.C();
                 result['s'] = s;
                 result['v'] = v.asString(16);
                 
                 return result;
         },
         
         'serverSideCredentials': function() {
diff --git a/frontend/gamma/js/Clipperz/DOM.js b/frontend/gamma/js/Clipperz/DOM.js
index 8f24653..1d52a4b 100644
--- a/frontend/gamma/js/Clipperz/DOM.js
+++ b/frontend/gamma/js/Clipperz/DOM.js
@@ -1,46 +1,44 @@
 /*
 
-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.DOM) == 'undefined') { Clipperz.DOM = {}; }
 
 Clipperz.DOM.VERSION = "0.1";
 Clipperz.DOM.NAME = "Clipperz.DOM";
 
 MochiKit.Base.update(Clipperz.DOM, {
 
         //-------------------------------------------------------------------------
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
@@ -85,49 +83,49 @@ MochiKit.Base.update(Clipperz.DOM, {
         //      var m = MochiKit.Base;
         //      var self = MochiKit.DOM;
                 if (typeof(aNode) == "undefined" || aNode === null) {
                         node = MochiKit.DOM._document.body;
                 } else {
                         node = MochiKit.DOM.getElement(aNode);
                 }
 
                 MochiKit.Base.nodeWalk(node, function(aNode) {
                         var result;
                         var name;
 
                         result = null;
                         name = aNode.name;
                         if (MochiKit.Base.isNotEmpty(name) && (typeof(values[name]) != 'undefined')) {
                                 var tagName;
 
                                 tagName = aNode.tagName.toUpperCase();
                                 if (tagName === "INPUT" && (aNode.type == "radio" || aNode.type == "checkbox")) {
                                         aNode.checked = values[name];
                                 } else if (tagName === "SELECT") {
                                         if (aNode.type == "select-one") {
                                                 Clipperz.DOM.selectOptionMatchingValue(aNode, values[name]);
                                                 } else { //aNode.type == "select-multiple"
-MochiKit.Logging.logWarning("### unhandled Select.type = 'select-multiple' condition");
+                                                Clipperz.logWarning("### unhandled Select.type = 'select-multiple' condition");
                                         }
                                 } else if (tagName === "FORM" || tagName === "P" || tagName === "SPAN" || tagName === "DIV") {
                                         result = aNode.childNodes;
                                 } else {
                                         aNode.value = values[name]
                                 }
                         } else {
                                 result = aNode.childNodes;
                         }
 
                         return result;
                 });
         },
 
         //-------------------------------------------------------------------------
 
         'get': MochiKit.DOM.getElement,
 
         //-------------------------------------------------------------------------
 
         'Helper': Clipperz.YUI.DomHelper,
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
diff --git a/frontend/gamma/js/Clipperz/Date.js b/frontend/gamma/js/Clipperz/Date.js
index 020d77b..163790e 100644
--- a/frontend/gamma/js/Clipperz/Date.js
+++ b/frontend/gamma/js/Clipperz/Date.js
@@ -1,46 +1,44 @@
 /*
 
-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.Date) == 'undefined') { Clipperz.Date = {}; }
 
 Clipperz.Date.VERSION = "0.1";
 Clipperz.Date.NAME = "Clipperz.Date";
 
 MochiKit.Base.update(Clipperz.Date, {
 
         //-------------------------------------------------------------------------
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
@@ -218,76 +216,73 @@ MochiKit.Base.update(Clipperz.Date, {
                                 result = " + aDate.getGMTOffset()";
                                 break;
                         case "T":
                                 result = " + Clipperz.Date.getTimezone(aDate)";
                                 break;
                         case "Z":
                                 result = " + ( + aDate.getTimezoneOffset() * -60)";
                                 break;
                         default:
                                 result = " + '" + aCharacter + "'";
                                 break;
                 };
                 
                 return result;
         },
 
         //=========================================================================
 
         'formatDateWithPHPLikeTemplateAndLocale': function(aDate, aFormat, aLocale) {
                 var result;
                 var formatterCode;
                 var formatter;
                 var i,c;
                 
-//MochiKit.Logging.logDebug(">>> Clipperz.Date.formatDateWithPHPLikeTemplateAndLocale");
                 formatterCode = "Clipperz.Date.__scratchFormatter = function(aDate, aLocale){return ''";
 
                 c = aFormat.length;
                 i = 0;
                 
                 while (i<c) {
                     var character;
         
                 character = aFormat.charAt(i);
                         if (character == "\\") {
                                 i++;
                                 character = aFormat.charAt(i);
                                 formatterCode += " + '" + character + "'"
                         } else {
                     formatterCode += Clipperz.Date.getPHPLikeFormatCode(character);
                         }
                         
                         i++;
                 }
                 
                 formatterCode += ";}";
-//MochiKit.Logging.logDebug("--- Clipperz.Date.formatDateWithPHPLikeTemplateAndLocale - formatterCode: " + formatterCode);
                 eval(formatterCode);
                 
                 result = Clipperz.Date.__scratchFormatter.call(this, aDate, aLocale);
                 delete Clipperz.Date.__scratchFormatter;
-//MochiKit.Logging.logDebug("<<< Clipperz.Date.formatDateWithPHPLikeTemplateAndLocale");
 
                 return result;
         },
 
         //-------------------------------------------------------------------------
         
         'parseDateWithPHPLikeTemplateAndLocale': function(aString, aFormat, aLocale) {
                 return new Date();
         },
 
         //=========================================================================
         
         'formatDateWithUTCFormatAndLocale': function(aDate, aLocale) {
         //      return Clipperz.Date.formatWithJavaLikeTemplateAndLocale(aDate, "EEE, dd MMMM yyyy HH:mm:ss zzz", aLocale);
                 return aDate.toString();
         },
         
         'parseDateWithUTCFormatAndLocale': function(aValue, aLocale) {
                 return new Date(Date.parse(aValue));
         },
 
         //=========================================================================
         
         'exception': {
diff --git a/frontend/gamma/js/Clipperz/KeePassExportProcessor.js b/frontend/gamma/js/Clipperz/KeePassExportProcessor.js
index a3c10c8..e35d729 100644
--- a/frontend/gamma/js/Clipperz/KeePassExportProcessor.js
+++ b/frontend/gamma/js/Clipperz/KeePassExportProcessor.js
@@ -1,46 +1,44 @@
 /*
 
-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 = {}; }
 
 
 Clipperz.KeePassExportProcessor = function(args) {
         args = args || {};
 
         return this;
 }
 
 //=============================================================================
 
 Clipperz.KeePassExportProcessor.prototype = MochiKit.Base.update(null, {
 
         //-------------------------------------------------------------------------
 
         'deferredParse_core': function(aContext) {
                 var deferredResult;
 
                 if (aContext.line == "") {
                         deferredResult = MochiKit.Async.succeed(aContext.result);
                 } else {
diff --git a/frontend/gamma/js/Clipperz/KeyValueObjectStore.js b/frontend/gamma/js/Clipperz/KeyValueObjectStore.js
index 36cda88..8bc125b 100644
--- a/frontend/gamma/js/Clipperz/KeyValueObjectStore.js
+++ b/frontend/gamma/js/Clipperz/KeyValueObjectStore.js
@@ -1,137 +1,130 @@
 /*
 
-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 = {}; }
 
 //#############################################################################
 
 Clipperz.KeyValueObjectStore = function(args) {
         args = args || {};
 
         //this._name = args['name'] || "unnamed KeyValueObjectStore";
         this._values = args['values'] || {};
         //this._referenceObjectStore = null;
-//console.log("new KeyValueObjectStore", args, this._values);
 
         return this;
 }
 
 Clipperz.KeyValueObjectStore.prototype = MochiKit.Base.update(null, {
 
         'values': function() {
                 return this._values;
         },
 
         'initWithValues': function (someValues) {
                 this._values = Clipperz.Base.deepClone(someValues) || {};
                 return this;
         },
 
         'setValues': function (someValues) {
-//console.log("KeyValueObjectStore.setValues", someValues);
                 this._values = someValues;
                 return this;
         },
 
         //'initWithObjectStore': function (anObjectStore) {
         //      this._referenceObjectStore = anObjectStore;
         //},
 
         'removeAllData': function () {
                 this._values = {};
         },
 
         //-------------------------------------------------------------------------
 
         'getValue': function(aKeyPath) {
                 var result;
                 var keys;
                 var i,c;
 
                 result = this.values();
 
                 keys = (aKeyPath + '').split('.');
                 c = keys.length;
                 i = 0;
 
                 while ((i<c) && (result != null)) {
                         if (typeof result[keys[i]] != 'undefined') {
                                 result = result[keys[i]];
                         } else {
                                 result = null;
                         }
                         
                         i++;
                 }
                 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'setValue': function(aKeyPath, aValue) {
                 var targetObject;
                 var keys;
                 var i,c;
 
-//console.log(">>> KeyValueObjectStore.setValue", this, this.values(), aKeyPath, aValue);
                 targetObject = this.values();
                 keys = (aKeyPath + '').split('.');
                 c = keys.length - 1;
                 for (i=0; i<c; i++) {
-//console.log("--- KeyValueObjectStore.setValue", i, targetObject, keys[i]);
                         if (typeof targetObject[keys[i]] == 'undefined') {
                                 targetObject[keys[i]] = {}
                         }
 
                         targetObject = targetObject[keys[i]];
                 }
 
                 targetObject[keys[c]] = aValue;
-//console.log("<<< KeyValueObjectStore.setValue");
                 
                 return aValue;
         },
 
         //-------------------------------------------------------------------------
 
         'removeValue': function (aKeyPath) {
         //      this.setValue(aKeyPath, null);
 
                 var targetObject;
                 var keys;
                 var i,c;
                 
                 targetObject = this.values();
                 keys = ('' + aKeyPath).split('.');
                 c = keys.length - 1;
                 for (i=0; i<c; i++) {
                         if (typeof targetObject[keys[i]] == 'undefined') {
                                 targetObject[keys[i]] = {}
                         }
 
                         targetObject = targetObject[keys[i]];
                 }
 
diff --git a/frontend/gamma/js/Clipperz/Logging.js b/frontend/gamma/js/Clipperz/Logging.js
index 77a0896..b6b806a 100644
--- a/frontend/gamma/js/Clipperz/Logging.js
+++ b/frontend/gamma/js/Clipperz/Logging.js
@@ -1,39 +1,32 @@
 /*
 
-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');
 
-if (typeof console == 'undefined') {
-        Clipperz.log = MochiKit.Logging.logDebug;
-// Safari/WebKit 4
-} else if (navigator.userAgent.match(/WebKit/)) {
-        //Clipperz.log = console.log;
-        Clipperz.log = MochiKit.Logging.logDebug;
-} else if (navigator.userAgent.match(/Gecko/)) {
-        Clipperz.log = function () { 
-        //      firebug 1.3 bug see http://code.google.com/p/fbug/issues/detail?id=1347         
-                console.log.apply(window._firebug, arguments);
-        };
-}
\ No newline at end of file
+Clipperz.log = function () {
+        console.log.apply(console, arguments);
+}
+
+        Clipperz.logError= Clipperz.log;
+        Clipperz.logWarning= Clipperz.log;
+        Clipperz.logDebug= Clipperz.log;
\ No newline at end of file
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,46 +1,44 @@
 /*
 
-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";
         },
 
         //-------------------------------------------------------------------------
 
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,46 +1,44 @@
 /*
 
-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;
@@ -65,49 +63,50 @@ Clipperz.PM.Connection.prototype = MochiKit.Base.update(null, {
                                 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;
         },
 
@@ -252,49 +251,48 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
                                         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) {
@@ -432,100 +430,99 @@ Clipperz.PM.Connection.SRP['1.0'].prototype = MochiKit.Base.update(new Clipperz.
         '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;
         },
 
         //=========================================================================
 
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,46 +1,44 @@
 /*
 
-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__();
         },
 
@@ -153,81 +151,81 @@ MochiKit.Base.update(Clipperz.PM.Crypto, {
                                                 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);
                                         
@@ -270,166 +268,166 @@ MochiKit.Base.update(Clipperz.PM.Crypto, {
                                         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);
         },
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,46 +1,44 @@
 /*
 
-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');
@@ -308,49 +306,49 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
 
         //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;
@@ -460,52 +458,51 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
                                                         //'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');
         },
 
         //=========================================================================
@@ -515,63 +512,59 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
                         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) {
@@ -653,61 +646,58 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
 
                                 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;
                                         }
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,46 +1,44 @@
 /*
 
-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() {
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,46 +1,44 @@
 /*
 
-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, {
 
@@ -66,39 +64,38 @@ Clipperz.PM.DataModel.DirectLoginFormValue.prototype = MochiKit.Base.update(null
                 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,46 +1,44 @@
 /*
 
-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() {
@@ -55,49 +53,49 @@ Clipperz.PM.DataModel.DirectLoginInput.prototype = MochiKit.Base.update(null, {
                 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':
@@ -133,54 +131,48 @@ Clipperz.PM.DataModel.DirectLoginInput.prototype = MochiKit.Base.update(null, {
                                                         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;
         },
 
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,46 +1,44 @@
 /*
 
-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;
@@ -390,52 +388,48 @@ Clipperz.PM.DataModel.EncryptedRemoteObject.prototype = MochiKit.Base.update(nul
 
         //-------------------------------------------------------------------------
         
         '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');
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,46 +1,44 @@
 /*
 
-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;
@@ -122,145 +120,145 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
                 
                 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;
         },
         
@@ -287,68 +285,66 @@ Clipperz.PM.DataModel.OneTimePassword.prototype = MochiKit.Base.update(null, {
 
                 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,46 +1,44 @@
 /*
 
-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() + ")";
         },
 
         //-------------------------------------------------------------------------
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,55 +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/.
 
 */
 
 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 () {
@@ -78,49 +75,48 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record.Version, Clipperz.PM.DataModel
                 });
                 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;
@@ -271,49 +267,48 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record.Version, Clipperz.PM.DataModel
 
         '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;
         },
 
         //=========================================================================
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,90 +1,85 @@
 /*
 
-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());
         },
 
         //.........................................................................
 
@@ -189,109 +184,106 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
         },
 
         //=========================================================================
 
         '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});
                 
         },
 
@@ -308,71 +300,68 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                                 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;
@@ -515,171 +504,160 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
 
         '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})
@@ -755,89 +733,87 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
                         ]);
                         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')),
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,46 +1,44 @@
 /*
 
-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() {
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,104 +1,96 @@
 /*
 
-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;
                                         
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,46 +1,44 @@
 /*
 
-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";
         },
 
         //-------------------------------------------------------------------------
         //=========================================================================
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,59 +1,56 @@
 /*
 
-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();
@@ -97,97 +94,94 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.RecordIndex, Object, {
                 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')
@@ -240,93 +234,87 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User.Header.RecordIndex, Object, {
                 
                                                         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)
@@ -365,124 +353,120 @@ Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
                         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)
@@ -549,49 +533,48 @@ Clipperz.log("WARNING: DIRECT LOGIN without a matching RECORD!!");
         //      "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();
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,46 +1,44 @@
 /*
 
-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;
@@ -307,49 +305,48 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                 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;
@@ -396,49 +393,48 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
                                 } 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;
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,46 +1,44 @@
 /*
 
-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__();
         },
 
         //-------------------------------------------------------------------------
 
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,46 +1,44 @@
 /*
 
-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,
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,46 +1,44 @@
 /*
 
-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;
@@ -48,95 +46,89 @@ Clipperz.PM.Proxy = function(args) {
 
 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) {
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,46 +1,44 @@
 /*
 
-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";
         },
 
         //=========================================================================
 
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,46 +1,44 @@
 /*
 
-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, {
 
@@ -86,64 +84,62 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
 
         '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;
@@ -374,49 +370,49 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
                                                         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;
@@ -504,215 +500,201 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
                                         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;
                 }
                 
@@ -728,53 +710,51 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
                 
                 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];
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,46 +1,44 @@
 /*
 
-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";
         },
 
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,46 +1,44 @@
 /*
 
-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";
         },
 
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,46 +1,44 @@
 /*
 
-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, {
@@ -77,88 +75,82 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Test, Clipperz.PM.Proxy.Offline, {
 
         '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,46 +1,44 @@
 /*
 
-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* /},
@@ -220,64 +218,59 @@ Clipperz.PM.Strings.Languages.setSelectedLanguage = function(aLanguage) {
                 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");
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,46 +1,44 @@
 /*
 
-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,
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,46 +1,44 @@
 /*
 
-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",
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,46 +1,44 @@
 /*
 
-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>\
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,46 +1,44 @@
 /*
 
-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') + ")";
         },
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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)
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,46 +1,44 @@
 /*
 
-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
         },
 
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,46 +1,44 @@
 /*
 
-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);
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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)
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,46 +1,44 @@
 /*
 
-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)
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,46 +1,44 @@
 /*
 
-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;
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,46 +1,44 @@
 /*
 
-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 = {};
@@ -102,49 +100,48 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.BaseComponent, /*Ext.Compo
         
         '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();
@@ -292,53 +289,50 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.BaseComponent, /*Ext.Compo
         },
 
         '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()) {
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,46 +1,44 @@
 /*
 
-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, {
 
         //-------------------------------------------------------------------------
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,46 +1,44 @@
 /*
 
-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;
         },
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,46 +1,44 @@
 /*
 
-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";
@@ -56,33 +54,33 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.FaviconComponent, Clipperz
                 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,46 +1,44 @@
 /*
 
-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, {
 
         //-------------------------------------------------------------------------
@@ -110,52 +108,48 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.MessagePanelWithProgressBa
                         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,62 +1,58 @@
 /*
 
-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();
@@ -89,49 +85,38 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.PasswordEntropyDisplay, Cl
                 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,46 +1,44 @@
 /*
 
-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, {
 
         //-------------------------------------------------------------------------
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,46 +1,44 @@
 /*
 
-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;
 }
 
 //=============================================================================
@@ -197,101 +195,93 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.SimpleMessagePanel, Clippe
 
         '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,46 +1,44 @@
 /*
 
-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";
         },
 
         //-------------------------------------------------------------------------
 
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,46 +1,44 @@
 /*
 
-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;
 }
 
 //=============================================================================
@@ -120,89 +118,82 @@ Clipperz.Base.extend(Clipperz.PM.UI.Common.Components.Tooltip, Clipperz.PM.UI.Co
 
         '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"
 });
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,46 +1,44 @@
 /*
 
-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, {
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,46 +1,44 @@
 /*
 
-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;
         },
 
@@ -133,132 +131,126 @@ MochiKit.Base.update(Clipperz.PM.UI.Common.Controllers.DirectLoginRunner.prototy
                         '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,46 +1,44 @@
 /*
 
-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";
         },
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,46 +1,44 @@
 /*
 
-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";
         },
 
         //-----------------------------------------------------------------------------
         
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,85 +1,82 @@
 /*
 
-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;
@@ -134,59 +131,57 @@ console.log("CardDetail.renderSelf");
                 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'),
@@ -245,49 +240,48 @@ console.log("CardDetail.showCard", aCard);
                                 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});
                 }
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,46 +1,44 @@
 /*
 
-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";
         },
@@ -69,80 +67,77 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.CardList, Clipperz.PM.UI.C
                 
         //              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;
@@ -150,49 +145,48 @@ console.log("###", listElement, cardReference);
 
                 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;
                 }
         },
 
         //=========================================================================
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,46 +1,44 @@
 /*
 
-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;
 }
 
@@ -118,49 +116,48 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
                 } 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);
@@ -278,79 +275,73 @@ Clipperz.Base.extend(Clipperz.PM.UI.Mobile.Components.LoginForm, Clipperz.PM.UI.
                         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,333 +1,321 @@
 /*
 
-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;
         },
@@ -341,53 +329,53 @@ console.log(">>> setupApplication");
                 
                 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,46 +1,44 @@
 /*
 
-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'
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,46 +1,44 @@
 /*
 
-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;
 }
 
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,46 +1,44 @@
 /*
 
-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";
         },
 
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,46 +1,44 @@
 /*
 
-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'
@@ -661,49 +659,48 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CardDialogComponent, Clipperz
                         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');
         },
 
@@ -741,86 +738,83 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CardDialogComponent, Clipperz
                 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'));
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,82 +1,79 @@
 /*
 
-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'},
@@ -96,84 +93,81 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CardDialogRecordDirectLoginCo
                                         {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,46 +1,44 @@
 /*
 
-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";
@@ -148,40 +146,38 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.CardDialogRecordFieldComponen
         //=========================================================================
 
         '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,46 +1,44 @@
 /*
 
-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;
 }
 
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,46 +1,44 @@
 /*
 
-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";
         },
 
         //-------------------------------------------------------------------------
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,46 +1,44 @@
 /*
 
-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'
                 },
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,46 +1,44 @@
 /*
 
-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";
         },
 
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,46 +1,44 @@
 /*
 
-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";
         },
 
         //-------------------------------------------------------------------------
 
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,46 +1,44 @@
 /*
 
-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";
         },
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,46 +1,44 @@
 /*
 
-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 () {
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,46 +1,44 @@
 /*
 
-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',
@@ -84,49 +82,48 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DirectLoginEditingComponent,
                 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);
         },
 
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,46 +1,44 @@
 /*
 
-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 () {
@@ -72,103 +70,98 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.DirectLoginEditingFormValueCo
                 }, 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,46 +1,44 @@
 /*
 
-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";
         },
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,46 +1,44 @@
 /*
 
-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";
         },
         
         //-------------------------------------------------------------------------
 
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,46 +1,44 @@
 /*
 
-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;
 }
 
 //=============================================================================
 
@@ -104,55 +102,53 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.GridComponent, Clipperz.PM.UI
                 
                 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');
                 }
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,46 +1,44 @@
 /*
 
-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";
         },
         
         //-------------------------------------------------------------------------
 
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,46 +1,44 @@
 /*
 
-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";
         },
 
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,46 +1,44 @@
 /*
 
-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, {
 
         //-------------------------------------------------------------------------
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,46 +1,44 @@
 /*
 
-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 () {
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,93 +1,90 @@
 /*
 
-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"}
                                 ]}
                         ]}
                 ]});
         //      ]);
 
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,46 +1,44 @@
 /*
 
-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',
@@ -102,50 +100,48 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Cli
         //=========================================================================
 
         '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'*/}]}
                                                                 ]}
                                                         ]},
@@ -312,52 +308,48 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.NewUserCreationComponent, Cli
                 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 () {
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,46 +1,44 @@
 /*
 
-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, {
 
         //-------------------------------------------------------------------------
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,46 +1,44 @@
 /*
 
-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";
         },
 
         //-------------------------------------------------------------------------
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,46 +1,44 @@
 /*
 
-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 () {
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,46 +1,44 @@
 /*
 
-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, {
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,46 +1,44 @@
 /*
 
-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, {
 
         //-------------------------------------------------------------------------
 
@@ -91,49 +89,48 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.RulerComponent, Clipperz.PM.U
 
         '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);
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,46 +1,44 @@
 /*
 
-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 () {
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,46 +1,44 @@
 /*
 
-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";
         },
         
         //-----------------------------------------------------
 
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,46 +1,44 @@
 /*
 
-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'
                 },
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,46 +1,44 @@
 /*
 
-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, {
 
         //-------------------------------------------------------------------------
@@ -139,43 +137,42 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UnlockPasswordComponent, Clip
 
         '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,46 +1,44 @@
 /*
 
-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 () {
@@ -55,119 +53,115 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UserInfoBox, Clipperz.PM.UI.C
                 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"}
                                         ]}
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,46 +1,44 @@
 /*
 
-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;
@@ -303,49 +301,48 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.AppController.prototype, {
         },
 
         //-----------------------------------------------------------------------------
 
         '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,46 +1,44 @@
 /*
 
-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;
@@ -353,49 +351,48 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Controllers.CardDialogController, Object
 
         '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;
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,46 +1,44 @@
 /*
 
-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({
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,46 +1,44 @@
 /*
 
-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;
@@ -142,49 +140,48 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.
         },
 
         '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;
         },
 
         //-----------------------------------------------------------------------------
 
@@ -386,50 +383,48 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.DirectLoginWizardController.
         '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 --;
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,46 +1,44 @@
 /*
 
-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',
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,46 +1,44 @@
 /*
 
-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 () {
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,46 +1,44 @@
 /*
 
-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() {
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,46 +1,44 @@
 /*
 
-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;
@@ -191,60 +189,58 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.LoginController.prototype, {
                 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,46 +1,44 @@
 /*
 
-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');
@@ -154,56 +152,50 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.MainController.prototype, {
         '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;
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,46 +1,44 @@
 /*
 
-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, {
@@ -51,49 +49,48 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
 
         //-------------------------------------------------------------------------
 
         '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;
         },
         
         //-----------------------------------------------------------------------------
 
@@ -201,58 +198,55 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
                 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;
@@ -316,49 +310,48 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
         //              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);
                 }
         },
 
@@ -385,49 +378,48 @@ MochiKit.Base.update(Clipperz.PM.UI.Web.Controllers.NewUserWizardController.prot
                         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'));
                 }
         },
diff --git a/frontend/gamma/js/Clipperz/Set.js b/frontend/gamma/js/Clipperz/Set.js
index 7023888..b3831a4 100644
--- a/frontend/gamma/js/Clipperz/Set.js
+++ b/frontend/gamma/js/Clipperz/Set.js
@@ -1,46 +1,44 @@
 /*
 
-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 = {};
 }
 
 //#############################################################################
 
 Clipperz.Set = function(args) {
         args = args || {};
         //MochiKit.Base.bindMethods(this);
 
         if (args.items != null) {
                 this._items = args.items.slice();
         } else {
                 this._items = [];
         }
 
         return this;
 }
 
 //=============================================================================
diff --git a/frontend/gamma/js/Clipperz/Signal.js b/frontend/gamma/js/Clipperz/Signal.js
index ca3e322..f9b74c9 100644
--- a/frontend/gamma/js/Clipperz/Signal.js
+++ b/frontend/gamma/js/Clipperz/Signal.js
@@ -1,46 +1,44 @@
 /*
 
-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.Signal) == 'undefined') { Clipperz.Signal = {}; }
 
 Clipperz.Signal.VERSION = "0.1";
 Clipperz.Signal.NAME = "Clipperz.Signal";
 
 MochiKit.Base.update(Clipperz.Signal, {
 
         //-------------------------------------------------------------------------
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/Style.js b/frontend/gamma/js/Clipperz/Style.js
index d377893..acbe71b 100644
--- a/frontend/gamma/js/Clipperz/Style.js
+++ b/frontend/gamma/js/Clipperz/Style.js
@@ -1,46 +1,44 @@
 /*
 
-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.Style) == 'undefined') { Clipperz.Style = {}; }
 
 Clipperz.Style.VERSION = "0.1";
 Clipperz.Style.NAME = "Clipperz.DOM";
 
 MochiKit.Base.update(Clipperz.Style, {
 
         //-------------------------------------------------------------------------
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/Visual.js b/frontend/gamma/js/Clipperz/Visual.js
index c2da3b7..93ed725 100644
--- a/frontend/gamma/js/Clipperz/Visual.js
+++ b/frontend/gamma/js/Clipperz/Visual.js
@@ -1,46 +1,44 @@
 /*
 
-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.Visual) == 'undefined') { Clipperz.Visual = {}; }
 
 Clipperz.Visual.VERSION = "0.1";
 Clipperz.Visual.NAME = "Clipperz.Visual";
 
 MochiKit.Base.update(Clipperz.Visual, {
 
         //-------------------------------------------------------------------------
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
diff --git a/frontend/gamma/js/Clipperz/YUI/DomHelper.js b/frontend/gamma/js/Clipperz/YUI/DomHelper.js
index 87c74f5..0a1f9fe 100644
--- a/frontend/gamma/js/Clipperz/YUI/DomHelper.js
+++ b/frontend/gamma/js/Clipperz/YUI/DomHelper.js
@@ -1,46 +1,44 @@
 /*
 
-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.YUI) == 'undefined') { Clipperz.YUI = {}; }

 

 

 /**

  * @class Clipperz.ext.DomHelper

  * Utility class for working with DOM and/or Templates. It transparently supports using HTML fragments or DOM. 

  * For more information see <a href="http://www.jackslocum.com/yui/2006/10/06/domhelper-create-elements-using-dom-html-fragments-or-templates/">this blog post with examples</a>.

  * @singleton

  */

 Clipperz.YUI.DomHelper = new function(){

     /**@private*/

     var d = document;

     var tempTableEl = null;

     /** True to force the use of DOM instead of html fragments @type Boolean */

     this.useDom = false;

     var emptyTags = /^(?:base|basefont|br|frame|hr|img|input|isindex|link|meta|nextid|range|spacer|wbr|audioscope|area|param|keygen|col|limittext|spot|tab|over|right|left|choose|atop|of)$/i;

     /**

      * Applies a style specification to an element

      * @param {String/HTMLElement} el The element to apply styles to

      * @param {String/Object/Function} styles A style specification string eg "width:100px", or object in the form {width:"100px"}, or

@@ -419,60 +417,55 @@ Clipperz.YUI.DomHelper.Template.prototype = {
     /**

      * Applies the supplied values to the template and inserts the new node(s) after el

      * @param {String/HTMLElement/Element} el The context element

      * @param {Object} values The template values. Can be an array if your params are numeric (i.e. {0}) or an object (i.e. {foo: 'bar'})

      * @param {<i>Boolean</i>} returnElement (optional) true to return a YAHOO.Element

      * @return {HTMLElement} The new node

      */

     insertAfter : function(el, values, returnElement){

         el = el.dom ? el.dom : YAHOO.util.Dom.get(el);

         var newNode = Clipperz.YUI.DomHelper.insertHtml('afterEnd', el, this.applyTemplate(values));

         return returnElement ? YAHOO.Element.get(newNode, true) : newNode;

     },

     

     /**

      * Applies the supplied values to the template and append the new node(s) to el

      * @param {String/HTMLElement/Element} el The context element

      * @param {Object} values The template values. Can be an array if your params are numeric (i.e. {0}) or an object (i.e. {foo: 'bar'})

      * @param {<i>Boolean</i>} returnElement (optional) true to return a YAHOO.Element

      * @return {HTMLElement} The new node

      */

     append : function(el, values, returnElement){

                 var sanitizedValues;

                 var key;

                 

-        //      sanitizedValues = MochiKit.Base.map(sanitizedValues)

-//console.log("values", values);

                 sanitizedValues = {};

                 for (key in values) {

                         sanitizedValues[key] = Clipperz.Base.sanitizeString(values[key]);

                 }

-//console.log("sanitizedValues", sanitizedValues);

-//        el = el.dom ? el.dom : YAHOO.util.Dom.get(el);

                 el = (typeof el == 'string') ? YAHOO.util.Dom.get(el) : el;

-//Clipperz.log(this.applyTemplate(sanitizedValues));

                 var newNode = Clipperz.YUI.DomHelper.insertHtml('beforeEnd', el, this.applyTemplate(sanitizedValues));

-//        return returnElement ? YAHOO.Element.get(newNode, true) : newNode;

+

                 return newNode;

     },

     

     /**

      * Applies the supplied values to the template and overwrites the content of el with the new node(s)

      * @param {String/HTMLElement/Element} el The context element

      * @param {Object} values The template values. Can be an array if your params are numeric (i.e. {0}) or an object (i.e. {foo: 'bar'})

      * @param {<i>Boolean</i>} returnElement (optional) true to return a YAHOO.Element

      * @return {HTMLElement} The new node

      */

     overwrite : function(el, values, returnElement){

         el = el.dom ? el.dom : YAHOO.util.Dom.get(el);

         el.innerHTML = '';

         var newNode = Clipperz.YUI.DomHelper.insertHtml('beforeEnd', el, this.applyTemplate(values));

         return returnElement ? YAHOO.Element.get(newNode, true) : newNode;

     }

 };

 /**

  * Alias for applyTemplate

  * @method

  */

 Clipperz.YUI.DomHelper.Template.prototype.apply = Clipperz.YUI.DomHelper.Template.prototype.applyTemplate;

 

 Clipperz.YUI.Template = Clipperz.YUI.DomHelper.Template;

diff --git a/frontend/gamma/js/Clipperz/YUI/DomQuery.js b/frontend/gamma/js/Clipperz/YUI/DomQuery.js
index 76d0fae..c1af0ca 100644
--- a/frontend/gamma/js/Clipperz/YUI/DomQuery.js
+++ b/frontend/gamma/js/Clipperz/YUI/DomQuery.js
@@ -1,46 +1,44 @@
 /*
 
-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.YUI) == 'undefined') { Clipperz.YUI = {}; }
 
 
 /*
  * yui-ext 0.40
  * Copyright(c) 2006, Jack Slocum.
  */
 
 /**
  * @class Clipperz.YUI.DomQuery
  * Provides high performance selector/xpath processing by compiling queries into reusable functions.
  * New pseudo classes and matchers can be plugged. It works on HTML and XML documents (if a content node is passed in).
  * @singleton
  */
 Clipperz.YUI.DomQuery = function(){
     var cache = {}, simpleCache = {}, valueCache = {};
     var nonSpace = /\S/;
     var trimRe = /^\s*(.*?)\s*$/;
     var tplRe = /\{(\d+)\}/g;
     var modeRe = /^(\s?[\/>]\s?|\s|$)/;
diff --git a/frontend/gamma/js/Clipperz/YUI/Utils.js b/frontend/gamma/js/Clipperz/YUI/Utils.js
index e9929fc..4def842 100644
--- a/frontend/gamma/js/Clipperz/YUI/Utils.js
+++ b/frontend/gamma/js/Clipperz/YUI/Utils.js
@@ -1,46 +1,44 @@
 /*
 
-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 YAHOO == 'undefined') { YAHOO = {}; };
 if (typeof YAHOO.util == 'undefined') { YAHOO.util = {}; };
 if (typeof YAHOO.util.Dom == 'undefined') { YAHOO.util.Dom = {}; };
 
 YAHOO.extend = function(subc, superc, overrides) {
         var F = function() {};
         F.prototype=superc.prototype;
         subc.prototype=new F();
         subc.prototype.constructor=subc;
         subc.superclass=superc.prototype;
         if (superc.prototype.constructor == Object.prototype.constructor) {
                 superc.prototype.constructor=superc;
         }
 
         if (overrides) {
                 for (var i in overrides) {
                         subc.prototype[i]=overrides[i];
                 }
         }
 };