79 files changed, 805 insertions, 1080 deletions
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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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);
+Clipperz.logError("## MainController - GENERIC ERROR" + "\n" + "==>> " + anError + " <<==\n" + anError.stack);
-//console.log(anError);
                        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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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.
+This file is part of Clipperz, the online password manager.
-Clipperz Community Edition is an 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
+* Clipperz is free software: you can redistribute it and/or modify it
-  it and/or modify it under the terms of the GNU Affero General Public
+  under the terms of the GNU Affero General Public License as published
-  License as published by the Free Software Foundation, either version
+  by the Free Software Foundation, either version 3 of the License, or 
-  3 of the License, or (at your option) any later version.
+  (at your option) any later version.
-* Clipperz Community Edition is distributed in the hope that it will
+* Clipperz is distributed in the hope that it will be useful, but 
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  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
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
-  <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'));
                }
        },