diff --git a/addons/google_calendar/__openerp__.py b/addons/google_calendar/__openerp__.py
index fd273ff55e7..fd885b406db 100644
--- a/addons/google_calendar/__openerp__.py
+++ b/addons/google_calendar/__openerp__.py
@@ -35,7 +35,6 @@ The module adds the possibility to synchronize Google Calendar with OpenERP
     'js': ['static/src/js/*.js'],
     'qweb': ['static/src/xml/*.xml'],
     'data': [
-             'google_calendar_data.xml',
              'res_config_view.xml',
              'security/ir.model.access.csv',
             ],
diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py
index f1e755a7491..131c39c8040 100644
--- a/addons/google_calendar/google_calendar.py
+++ b/addons/google_calendar/google_calendar.py
@@ -570,8 +570,9 @@ class google_calendar(osv.osv):
                                         if event_to_synchronize[base_event][0][1].get('OE_event_id'):                                
                                             parent_oe_id =  event_to_synchronize[base_event][0][1].get('OE_event_id')
                                             crm_meeting.unlink(cr,uid,"%s-%s" % (parent_oe_id,new_google_event_id),unlink_level=1,context=context)
-                                        else:
-                                            raise "Need to delete !"
+                                        #else:
+                                            
+                                            #raise "Need to delete !"
                                     
                     elif actToDo == 'DELETE':
                         if actSrc == 'GG':
diff --git a/addons/google_calendar/google_calendar.pyc b/addons/google_calendar/google_calendar.pyc
index 9d1d626c6cf..ef793166c5a 100644
Binary files a/addons/google_calendar/google_calendar.pyc and b/addons/google_calendar/google_calendar.pyc differ
diff --git a/addons/google_calendar/google_calendar_data.xml b/addons/google_calendar/google_calendar_data.xml
deleted file mode 100644
index 85e3ce5d5d5..00000000000
--- a/addons/google_calendar/google_calendar_data.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-        <record id="config_calendar_id" model="ir.config_parameter">
-            <field name="key">google_calendar_client_id</field>
-            <field name="value"> </field>
-        </record>
-        <record id="config_calendar_secret" model="ir.config_parameter">
-            <field name="key">google_calendar_client_secret</field>
-            <field name="value"> </field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/google_calendar/res_config_view.xml b/addons/google_calendar/res_config_view.xml
index 59c571721e5..953aaacc05b 100644
--- a/addons/google_calendar/res_config_view.xml
+++ b/addons/google_calendar/res_config_view.xml
@@ -14,56 +14,55 @@
                     </header>
                     <separator string="Google synchronization Settings"/>
                     <div>
-                        <group>
-                            <div>
-                                <label for="google_cal_sync"/>
-                                <field name="google_cal_sync" class="oe_inline"/>                            
-                                <div> 
-                                    <div attrs="{'invisible':[('google_cal_sync','=',False)]}">
-                                        <br/><h2>To setup the signin process with Google, first you have to perform the following steps</h2>
-                                        <ul> 
-                                            <li> Connect on your google account and go to <a href='https://cloud.google.com/console' target='_blank'>https://cloud.google.com/console</a> </li>
-                                            <li> 
-                                                Click on <b>"Create Project"</b> and enter a project name and change your id if you want. Don't forget to accept the Terms of Services
-                                                <br/><img src='/google_calendar/static/src/img/setup_01.png' class='calendar_img_tuto'/> 
-                                                <br/><img src='/google_calendar/static/src/img/setup_02.png' class='calendar_img_tuto'/>   
-                                            </li>
-                                            <li> In the menu on left side, select the sub menu APIs (from menu APIs and auth) and activate <b>"Calendar API"</b> by clicking on button "OFF".
-                                                <br/> You will need to accept again the "Google APIs Terms of services" and "Calendar API Terms of service"
-                                                <br/> When it's done, check that the button of "Calendar API" is well in green and with text "ON"
-                                                <br/> <img src='/google_calendar/static/src/img/setup_03.png' class='calendar_img_tuto'/>
-                                                <br/> <img src='/google_calendar/static/src/img/setup_04.png' class='calendar_img_tuto'/>
-                                                <br/> <img src='/google_calendar/static/src/img/setup_05.png' class='calendar_img_tuto'/>
-                                            </li> 
-                                            <li> 
-                                                In the menu on left side, select the sub menu <b>'Registered apps'</b> (from menu APIs and auth) and click on button "Register APP".
-                                                <br/> Fill in the Name of application and check that the platform is well on "Web Application" before to click on "Register"
-                                                <br/> <img src='/google_calendar/static/src/img/setup_06.png' class='calendar_img_tuto'/>
-                                                <br/> <img src='/google_calendar/static/src/img/setup_07.png' class='calendar_img_tuto'/>
-                                            </li> 
-                                            <li> 
-                                                Now, you can click on <b>"OAuth 2.0 Client ID"</b>  and see your <i>Client ID</i> and your <i>Client Secret</i>.
-                                                <br/>That's these both informations that you need to insert in the 2 fields below !
-                                                <br/> <img src='/google_calendar/static/src/img/setup_08.png' class='calendar_img_tuto'/>
-                                            </li>
-                                            <li> 
-                                                Remark : You can, if you want, personalize the consent screen that yours users will seen by clicking also in the left menu on "Consent Screen".                                                    
-                                            </li>
-                                        </ul>                                    
-                                    </div>
+                        <div>
+                            <label for="google_cal_sync"/>
+                            <field name="google_cal_sync" class="oe_inline"/>                            
+                            <div> 
+                                <div attrs="{'invisible':[('google_cal_sync','=',False)]}">
+                                    <br/><h2>To setup the signin process with Google, first you have to perform the following steps</h2>
+                                    <ul> 
+                                        <li> Connect on your google account and go to <a href='https://cloud.google.com/console' target='_blank'>https://cloud.google.com/console</a> </li>
+                                        <li> 
+                                            Click on <b>"Create Project"</b> and enter a project name and change your id if you want. Don't forget to accept the Terms of Services
+                                            <br/><img src='/google_calendar/static/src/img/setup_01.png' class='calendar_img_tuto'/> 
+                                            <br/><img src='/google_calendar/static/src/img/setup_02.png' class='calendar_img_tuto'/>   
+                                        </li>
+                                        <li> In the menu on left side, select the sub menu APIs (from menu APIs and auth) and activate <b>"Calendar API"</b> by clicking on button "OFF".
+                                            <br/> You will need to accept again the "Google APIs Terms of services" and "Calendar API Terms of service"
+                                            <br/> When it's done, check that the button of <b>"Calendar API"</b> is well in green and with text "ON"
+                                            <br/> <img src='/google_calendar/static/src/img/setup_03.png' class='calendar_img_tuto'/>
+                                            <br/> <img src='/google_calendar/static/src/img/setup_04.png' class='calendar_img_tuto'/>
+                                            <br/> <img src='/google_calendar/static/src/img/setup_05.png' class='calendar_img_tuto'/>
+                                        </li> 
+                                        <li> 
+                                            In the menu on left side, select the sub menu <b>'Registered apps'</b> (from menu APIs and auth) and click on button "Register APP".
+                                            <br/> Fill in the Name of application and check that the platform is well on <b>'Web Application'</b> before to click on <b>'Register"</b>
+                                            <br/> <img src='/google_calendar/static/src/img/setup_06.png' class='calendar_img_tuto'/>
+                                            <br/> <img src='/google_calendar/static/src/img/setup_07.png' class='calendar_img_tuto'/>
+                                        </li> 
+                                        <li> 
+                                            Now, you can click on <b>"OAuth 2.0 Client ID"</b>  and see your <u><i>Client ID</i></u> and your <u><i>Client Secret</i></u>.
+                                            <br/>That's these both informations that you need to insert in the 2 fields below !
+                                            <br/> <img src='/google_calendar/static/src/img/setup_08.png' class='calendar_img_tuto'/>
+                                        </li>
+                                        <li> 
+                                            Remark : You can, if you want, personalize the consent screen that your users will see by clicking also in the left menu on <b>"Consent Screen"</b>.                                                    
+                                        </li>
+                                    </ul>                                    
                                 </div>
                             </div>
-                        </group> 
+                        </div>
+                        
                         <group>
-                            <div>
+                            <div class="calendar_settings">
                                 <label for="cal_client_id" string="Google Client ID" />
-                                <field name="cal_client_id" class="oe_inline"/>  
+                                <field name="cal_client_id" class="oe_inline" />  
                             </div>
                         </group> 
                         <group>
                             <div>
                                 <label for="cal_client_secret" string="Google Client Secret"/>
-                                <field name="cal_client_secret" class="oe_inline"/>
+                                <field name="cal_client_secret" class="oe_inline" password="True"/>
                             </div>
                         </group>                            
                     </div>                              
diff --git a/addons/google_calendar/static/description/_the_calendar.png b/addons/google_calendar/static/description/_the_calendar.png
new file mode 100644
index 00000000000..113f16fad9e
Binary files /dev/null and b/addons/google_calendar/static/description/_the_calendar.png differ
diff --git a/addons/google_calendar/static/description/an_event.png b/addons/google_calendar/static/description/an_event.png
new file mode 100644
index 00000000000..8cffaf9ecc0
Binary files /dev/null and b/addons/google_calendar/static/description/an_event.png differ
diff --git a/addons/google_calendar/static/description/calendar_in_action.png b/addons/google_calendar/static/description/calendar_in_action.png
new file mode 100644
index 00000000000..e03c217b806
Binary files /dev/null and b/addons/google_calendar/static/description/calendar_in_action.png differ
diff --git a/addons/google_calendar/static/description/coworker.png b/addons/google_calendar/static/description/coworker.png
new file mode 100644
index 00000000000..e432095c044
Binary files /dev/null and b/addons/google_calendar/static/description/coworker.png differ
diff --git a/addons/google_calendar/static/description/create_quick.png b/addons/google_calendar/static/description/create_quick.png
new file mode 100644
index 00000000000..a877ed2dcba
Binary files /dev/null and b/addons/google_calendar/static/description/create_quick.png differ
diff --git a/addons/google_calendar/static/description/email.png b/addons/google_calendar/static/description/email.png
new file mode 100644
index 00000000000..b7ea5a0d9f9
Binary files /dev/null and b/addons/google_calendar/static/description/email.png differ
diff --git a/addons/google_calendar/static/description/icon.png b/addons/google_calendar/static/description/icon.png
new file mode 100644
index 00000000000..581f1f5311b
Binary files /dev/null and b/addons/google_calendar/static/description/icon.png differ
diff --git a/addons/google_calendar/static/description/index.html b/addons/google_calendar/static/description/index.html
new file mode 100644
index 00000000000..b4732c29c3c
--- /dev/null
+++ b/addons/google_calendar/static/description/index.html
@@ -0,0 +1,114 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Google Calendar</h2>
+        <h3 class="oe_slogan">Get your meetings, yours holidays, ...  Get your calendar anywhere and never forget an event.</h3>
+        <div class="oe_span12">
+            <img src="the_calendar.png" class="oe_picture oe_screenshot">                            
+        </div>        
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Keep an eye on your events</h2>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+				See easily the purpose of the meeting, the start time and also the attendee(s)... All that without click on anything...
+			</p>			
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="an_event.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Create so easily an event</h2>
+         <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="create_quick.png">
+         </div>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+				In just one click you can create an event...<br/>
+			</p>			
+         </div>
+        
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Create recurrent event</h2>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+				You can also create recurrent events with only one event.
+			</p>			
+         </div>
+         <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="recurrent.png">
+         </div>
+        
+    </div>
+</section>
+
+<section class="oe_container ">
+    <div class="oe_row">
+         <h2 class="oe_slogan">See all events you wants </h2>
+         <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="coworker.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+				See in your calendar, the event from others peoples where your are attendees, but also their events by simply adding your favorites coworkers.<br/>
+				Every coworker will have their own color in your calendar, and every attendee wil lhave their avatar in the event...<br/>
+			</p>			
+        </div>
+        
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Get an email</h2>
+         <div class="oe_span6">
+            <p class='oe_mt32'>
+				You will receive an email at creation of an event where you are attendee, but also when htis event is updated for some fields as date start, ...
+			</p>			
+         </div>
+         <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="email.png">
+         </div>
+        
+    </div>
+</section>
+
+<section class="oe_container ">
+    <div class="oe_row">
+         <h2 class="oe_slogan">Be notified </h2>
+         <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="notification.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+				You can ask to have a alarm of type 'notification' in your Open ERP.<br/>
+				You will have a notification in you OpenERP which ever the page you are.
+			</p>			
+        </div>
+        
+    </div>
+</section>
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Google Calendar</h2>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+				With the plugin Google_calendar, you can synchronize your OpenERP calendar with Google Calendar.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="calendar_in_action.png">
+        </div>
+        
+    </div>
+</section>
diff --git a/addons/google_calendar/static/description/notification.png b/addons/google_calendar/static/description/notification.png
new file mode 100644
index 00000000000..199d7868206
Binary files /dev/null and b/addons/google_calendar/static/description/notification.png differ
diff --git a/addons/google_calendar/static/description/recurrent.png b/addons/google_calendar/static/description/recurrent.png
new file mode 100644
index 00000000000..35b6609e15a
Binary files /dev/null and b/addons/google_calendar/static/description/recurrent.png differ
diff --git a/addons/google_calendar/static/description/the_calendar.png b/addons/google_calendar/static/description/the_calendar.png
new file mode 100644
index 00000000000..87cd4c01545
Binary files /dev/null and b/addons/google_calendar/static/description/the_calendar.png differ