diff --git a/addons/web_calendar/__init__.py b/addons/web_calendar/__init__.py
index 74856718eeb..e69de29bb2d 100644
--- a/addons/web_calendar/__init__.py
+++ b/addons/web_calendar/__init__.py
@@ -1 +0,0 @@
-import contacts
\ No newline at end of file
diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py
index cb75471b152..090684a764c 100644
--- a/addons/web_calendar/__openerp__.py
+++ b/addons/web_calendar/__openerp__.py
@@ -8,10 +8,7 @@ OpenERP Web Calendar view.
 """,
     'version': '2.0',
     'depends': ['web'],
-    'data' : [
-              'contacts_view.xml',
-              'security/ir.model.access.csv',
-             ],
+    'data' : [],
     'js': [
         'static/lib/fullcalendar/js/fullcalendar.js',
         'static/src/js/*.js'
diff --git a/addons/web_calendar/contacts.py b/addons/web_calendar/contacts.py
deleted file mode 100644
index 32ab6df3b83..00000000000
--- a/addons/web_calendar/contacts.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from openerp.osv import fields, osv
-
-class web_calendar_contacts(osv.osv):
-    _name = 'web_calendar.contacts'    
-
-    _columns = {
-        'user_id': fields.many2one('res.users','Me'),
-        'partner_id': fields.many2one('res.partner','Employee',required=True, domain=[('customer','=',True)]),
-        'active':fields.boolean('active'),        
-     }
-    _defaults = {
-        'user_id': lambda self, cr, uid, ctx: uid,
-        'active' : True,        
-    }
\ No newline at end of file
diff --git a/addons/web_calendar/contacts_view.xml b/addons/web_calendar/contacts_view.xml
deleted file mode 100644
index 4977608c727..00000000000
--- a/addons/web_calendar/contacts_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record id="view_calendar_contacts" model="ir.ui.view">
-            <field name="name">My Coworkers</field>
-            <field name="model">web_calendar.contacts</field>
-            <field name="arch" type="xml">
-                <tree string="contacts" editable="bottom">
-                    <field name="partner_id"/>
-                </tree>                
-            </field>
-        </record>    
-    
-        <record id="action_calendar_contacts" model="ir.actions.act_window">
-            <field name="name">Calendar Contacts</field>
-            <field name="res_model">web_calendar.contacts</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_calendar_contacts" />
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click on "<b>create</b>" to select colleagues you want to see meetings. 
-              </p><p>
-                Your colleagues will appear in the right list to see them in the calendar view. You will easily manage collaboration and meeting with them.
-              </p>
-            </field>                       
-        </record>
-            
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/web_calendar/security/ir.model.access.csv b/addons/web_calendar/security/ir.model.access.csv
deleted file mode 100644
index ea1b4050949..00000000000
--- a/addons/web_calendar/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_web_calendar_contacts_all,access_web_calendar_contacts_all,model_web_calendar_contacts,,1,1,1,1
-access_web_calendar_contacts,access_web_calendar_contacts,model_web_calendar_contacts,base.group_system,1,1,1,1
diff --git a/addons/web_calendar/static/src/css/web_fullcalendar.css b/addons/web_calendar/static/src/css/web_fullcalendar.css
index dbaccd788ba..188376f75cc 100644
--- a/addons/web_calendar/static/src/css/web_fullcalendar.css
+++ b/addons/web_calendar/static/src/css/web_fullcalendar.css
@@ -1,471 +1,275 @@
 @charset "utf-8";
 .openerp .oe_view_manager_view_calendar {
-  position: relative;
-}
+  position: relative; }
 .openerp .oe_calendar_table {
   margin-top: 10px;
-  margin-left: 5px;
-}
+  margin-left: 5px; }
 
 .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
-  z-index: 10;
-}
+  z-index: 10; }
 
 .openerp td.oe_calendar_sidebar_container {
-  padding: 10px;
-}
+  padding: 10px; }
 
 img.attendee_head {
   height: 18px;
-  width: 18px;
-}
+  width: 18px; }
 
-.attendee_head {
+.openerp .oe_calendar_table .attendee_head {
   float: right;
   margin-left: 1px;
-  size: 18px !important;
-}
-
-.cal_avatar {
+  size: 18px !important; }
+.openerp .oe_calendar_table .cal_avatar {
   height: 24px;
-  width: 24px;
-}
-
-.cal_opacity {
-  opacity: 0.6;
-}
-
-.event_color_1 {
+  width: 24px; }
+.openerp .oe_calendar_table .cal_opacity {
+  opacity: 0.6; }
+.openerp .oe_calendar_table .event_color_1 {
   background-color: #a4bdfc;
-  color: #0d0d0d;
-}
-
-.event_color_2 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_2 {
   background-color: #7ae7bf;
-  color: #0d0d0d;
-}
-
-.event_color_3 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_3 {
   background-color: #dbadff;
-  color: #0d0d0d;
-}
-
-.event_color_4 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_4 {
   background-color: #ff887c;
-  color: #0d0d0d;
-}
-
-.event_color_5 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_5 {
   background-color: #fbd75b;
-  color: #0d0d0d;
-}
-
-.event_color_6 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_6 {
   background-color: #ffb878;
-  color: #0d0d0d;
-}
-
-.event_color_7 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_7 {
   background-color: #46d6db;
-  color: #0d0d0d;
-}
-
-.event_color_8 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_8 {
   background-color: #e1e1e1;
-  color: #0d0d0d;
-}
-
-.event_color_9 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_9 {
   background-color: #5484ed;
-  color: #0d0d0d;
-}
-
-.event_color_10 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_10 {
   background-color: #51b749;
-  color: #0d0d0d;
-}
-
-.event_color_11 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .event_color_11 {
   background-color: #dc2127;
-  color: #0d0d0d;
-}
-
-.calendar_color_1 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_1 {
   border-color: #ac725e;
   background-color: #ac725e;
-  color: #0d0d0d;
-}
-
-.calendar_color_2 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_2 {
   border-color: #d06b64;
   background-color: #d06b64;
-  color: #0d0d0d;
-}
-
-.calendar_color_3 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_3 {
   border-color: #f83a22;
   background-color: #f83a22;
-  color: #0d0d0d;
-}
-
-.calendar_color_4 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_4 {
   border-color: #fa573c;
   background-color: #fa573c;
-  color: #0d0d0d;
-}
-
-.calendar_color_5 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_5 {
   border-color: #ff7537;
   background-color: #ff7537;
-  color: #0d0d0d;
-}
-
-.calendar_color_6 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_6 {
   border-color: #ffad46;
   background-color: #ffad46;
-  color: #0d0d0d;
-}
-
-.calendar_color_7 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_7 {
   border-color: #42d692;
   background-color: #42d692;
-  color: #0d0d0d;
-}
-
-.calendar_color_8 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_8 {
   border-color: #16a765;
   background-color: #16a765;
-  color: #0d0d0d;
-}
-
-.calendar_color_9 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_9 {
   border-color: #7bd148;
   background-color: #7bd148;
-  color: #0d0d0d;
-}
-
-.calendar_color_10 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_10 {
   border-color: #b3dc6c;
   background-color: #b3dc6c;
-  color: #0d0d0d;
-}
-
-.calendar_color_11 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_11 {
   border-color: #fbe983;
   background-color: #fbe983;
-  color: #0d0d0d;
-}
-
-.calendar_color_12 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_12 {
   border-color: #fad165;
   background-color: #fad165;
-  color: #0d0d0d;
-}
-
-.calendar_color_13 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_13 {
   border-color: #92e1c0;
   background-color: #92e1c0;
-  color: #0d0d0d;
-}
-
-.calendar_color_14 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_14 {
   border-color: #9fe1e7;
   background-color: #9fe1e7;
-  color: #0d0d0d;
-}
-
-.calendar_color_15 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_15 {
   border-color: #9fc6e7;
   background-color: #9fc6e7;
-  color: #0d0d0d;
-}
-
-.calendar_color_16 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_16 {
   border-color: #4986e7;
   background-color: #4986e7;
-  color: #0d0d0d;
-}
-
-.calendar_color_17 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_17 {
   border-color: #9a9cff;
   background-color: #9a9cff;
-  color: #0d0d0d;
-}
-
-.calendar_color_18 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_18 {
   border-color: #b99aff;
   background-color: #b99aff;
-  color: #0d0d0d;
-}
-
-.calendar_color_19 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_19 {
   border-color: #c2c2c2;
   background-color: #c2c2c2;
-  color: #0d0d0d;
-}
-
-.calendar_color_20 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_20 {
   border-color: #cabdbf;
   background-color: #cabdbf;
-  color: #0d0d0d;
-}
-
-.calendar_color_21 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_21 {
   border-color: #cca6ac;
   background-color: #cca6ac;
-  color: #0d0d0d;
-}
-
-.calendar_color_22 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_22 {
   border-color: #f691b2;
   background-color: #f691b2;
-  color: #0d0d0d;
-}
-
-.calendar_color_23 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_23 {
   border-color: #cd74e6;
   background-color: #cd74e6;
-  color: #0d0d0d;
-}
-
-.calendar_color_24 {
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .calendar_color_24 {
   border-color: #a47ae2;
   background-color: #a47ae2;
-  color: #0d0d0d;
-}
-
-.underline_ecolor_1 {
-  border-bottom: 4px solid #a4bdfc;
-}
-
-.underline_ecolor_2 {
-  border-bottom: 4px solid #7ae7bf;
-}
-
-.underline_ecolor_3 {
-  border-bottom: 4px solid #dbadff;
-}
-
-.underline_ecolor_4 {
-  border-bottom: 4px solid #ff887c;
-}
-
-.underline_ecolor_5 {
-  border-bottom: 4px solid #fbd75b;
-}
-
-.underline_ecolor_6 {
-  border-bottom: 4px solid #ffb878;
-}
-
-.underline_ecolor_7 {
-  border-bottom: 4px solid #46d6db;
-}
-
-.underline_ecolor_8 {
-  border-bottom: 4px solid #e1e1e1;
-}
-
-.underline_ecolor_9 {
-  border-bottom: 4px solid #5484ed;
-}
-
-.underline_ecolor_10 {
-  border-bottom: 4px solid #51b749;
-}
-
-.underline_ecolor_11 {
-  border-bottom: 4px solid #dc2127;
-}
-
-.underline_color_1 {
-  border-bottom: 4px solid #ac725e;
-}
-
-.underline_color_2 {
-  border-bottom: 4px solid #d06b64;
-}
-
-.underline_color_3 {
-  border-bottom: 4px solid #f83a22;
-}
-
-.underline_color_4 {
-  border-bottom: 4px solid #fa573c;
-}
-
-.underline_color_5 {
-  border-bottom: 4px solid #ff7537;
-}
-
-.underline_color_6 {
-  border-bottom: 4px solid #ffad46;
-}
-
-.underline_color_7 {
-  border-bottom: 4px solid #42d692;
-}
-
-.underline_color_8 {
-  border-bottom: 4px solid #16a765;
-}
-
-.underline_color_9 {
-  border-bottom: 4px solid #7bd148;
-}
-
-.underline_color_10 {
-  border-bottom: 4px solid #b3dc6c;
-}
-
-.underline_color_11 {
-  border-bottom: 4px solid #fbe983;
-}
-
-.underline_color_12 {
-  border-bottom: 4px solid #fad165;
-}
-
-.underline_color_13 {
-  border-bottom: 4px solid #92e1c0;
-}
-
-.underline_color_14 {
-  border-bottom: 4px solid #9fe1e7;
-}
-
-.underline_color_15 {
-  border-bottom: 4px solid #9fc6e7;
-}
-
-.underline_color_16 {
-  border-bottom: 4px solid #4986e7;
-}
-
-.underline_color_17 {
-  border-bottom: 4px solid #9a9cff;
-}
-
-.underline_color_18 {
-  border-bottom: 4px solid #b99aff;
-}
-
-.underline_color_19 {
-  border-bottom: 4px solid #c2c2c2;
-}
-
-.underline_color_20 {
-  border-bottom: 4px solid #cabdbf;
-}
-
-.underline_color_21 {
-  border-bottom: 4px solid #cca6ac;
-}
-
-.underline_color_22 {
-  border-bottom: 4px solid #f691b2;
-}
-
-.underline_color_23 {
-  border-bottom: 4px solid #cd74e6;
-}
-
-.underline_color_24 {
-  border-bottom: 4px solid #a47ae2;
-}
-
-.color_1 {
-  color: #ac725e;
-}
-
-.color_2 {
-  color: #d06b64;
-}
-
-.color_3 {
-  color: #f83a22;
-}
-
-.color_4 {
-  color: #fa573c;
-}
-
-.color_5 {
-  color: #ff7537;
-}
-
-.color_6 {
-  color: #ffad46;
-}
-
-.color_7 {
-  color: #42d692;
-}
-
-.color_8 {
-  color: #16a765;
-}
-
-.color_9 {
-  color: #7bd148;
-}
-
-.color_10 {
-  color: #b3dc6c;
-}
-
-.color_11 {
-  color: #fbe983;
-}
-
-.color_12 {
-  color: #fad165;
-}
-
-.color_13 {
-  color: #92e1c0;
-}
-
-.color_14 {
-  color: #9fe1e7;
-}
-
-.color_15 {
-  color: #9fc6e7;
-}
-
-.color_16 {
-  color: #4986e7;
-}
-
-.color_17 {
-  color: #9a9cff;
-}
-
-.color_18 {
-  color: #b99aff;
-}
-
-.color_19 {
-  color: #c2c2c2;
-}
-
-.color_20 {
-  color: #cabdbf;
-}
-
-.color_21 {
-  color: #cca6ac;
-}
-
-.color_22 {
-  color: #f691b2;
-}
-
-.color_23 {
-  color: #cd74e6;
-}
-
-.color_24 {
-  color: #a47ae2;
-}
+  color: #0d0d0d; }
+.openerp .oe_calendar_table .underline_ecolor_1 {
+  border-bottom: 4px solid #a4bdfc; }
+.openerp .oe_calendar_table .underline_ecolor_2 {
+  border-bottom: 4px solid #7ae7bf; }
+.openerp .oe_calendar_table .underline_ecolor_3 {
+  border-bottom: 4px solid #dbadff; }
+.openerp .oe_calendar_table .underline_ecolor_4 {
+  border-bottom: 4px solid #ff887c; }
+.openerp .oe_calendar_table .underline_ecolor_5 {
+  border-bottom: 4px solid #fbd75b; }
+.openerp .oe_calendar_table .underline_ecolor_6 {
+  border-bottom: 4px solid #ffb878; }
+.openerp .oe_calendar_table .underline_ecolor_7 {
+  border-bottom: 4px solid #46d6db; }
+.openerp .oe_calendar_table .underline_ecolor_8 {
+  border-bottom: 4px solid #e1e1e1; }
+.openerp .oe_calendar_table .underline_ecolor_9 {
+  border-bottom: 4px solid #5484ed; }
+.openerp .oe_calendar_table .underline_ecolor_10 {
+  border-bottom: 4px solid #51b749; }
+.openerp .oe_calendar_table .underline_ecolor_11 {
+  border-bottom: 4px solid #dc2127; }
+.openerp .oe_calendar_table .underline_color_1 {
+  border-bottom: 4px solid #ac725e; }
+.openerp .oe_calendar_table .underline_color_2 {
+  border-bottom: 4px solid #d06b64; }
+.openerp .oe_calendar_table .underline_color_3 {
+  border-bottom: 4px solid #f83a22; }
+.openerp .oe_calendar_table .underline_color_4 {
+  border-bottom: 4px solid #fa573c; }
+.openerp .oe_calendar_table .underline_color_5 {
+  border-bottom: 4px solid #ff7537; }
+.openerp .oe_calendar_table .underline_color_6 {
+  border-bottom: 4px solid #ffad46; }
+.openerp .oe_calendar_table .underline_color_7 {
+  border-bottom: 4px solid #42d692; }
+.openerp .oe_calendar_table .underline_color_8 {
+  border-bottom: 4px solid #16a765; }
+.openerp .oe_calendar_table .underline_color_9 {
+  border-bottom: 4px solid #7bd148; }
+.openerp .oe_calendar_table .underline_color_10 {
+  border-bottom: 4px solid #b3dc6c; }
+.openerp .oe_calendar_table .underline_color_11 {
+  border-bottom: 4px solid #fbe983; }
+.openerp .oe_calendar_table .underline_color_12 {
+  border-bottom: 4px solid #fad165; }
+.openerp .oe_calendar_table .underline_color_13 {
+  border-bottom: 4px solid #92e1c0; }
+.openerp .oe_calendar_table .underline_color_14 {
+  border-bottom: 4px solid #9fe1e7; }
+.openerp .oe_calendar_table .underline_color_15 {
+  border-bottom: 4px solid #9fc6e7; }
+.openerp .oe_calendar_table .underline_color_16 {
+  border-bottom: 4px solid #4986e7; }
+.openerp .oe_calendar_table .underline_color_17 {
+  border-bottom: 4px solid #9a9cff; }
+.openerp .oe_calendar_table .underline_color_18 {
+  border-bottom: 4px solid #b99aff; }
+.openerp .oe_calendar_table .underline_color_19 {
+  border-bottom: 4px solid #c2c2c2; }
+.openerp .oe_calendar_table .underline_color_20 {
+  border-bottom: 4px solid #cabdbf; }
+.openerp .oe_calendar_table .underline_color_21 {
+  border-bottom: 4px solid #cca6ac; }
+.openerp .oe_calendar_table .underline_color_22 {
+  border-bottom: 4px solid #f691b2; }
+.openerp .oe_calendar_table .underline_color_23 {
+  border-bottom: 4px solid #cd74e6; }
+.openerp .oe_calendar_table .underline_color_24 {
+  border-bottom: 4px solid #a47ae2; }
+.openerp .oe_calendar_table .color_1 {
+  color: #ac725e; }
+.openerp .oe_calendar_table .color_2 {
+  color: #d06b64; }
+.openerp .oe_calendar_table .color_3 {
+  color: #f83a22; }
+.openerp .oe_calendar_table .color_4 {
+  color: #fa573c; }
+.openerp .oe_calendar_table .color_5 {
+  color: #ff7537; }
+.openerp .oe_calendar_table .color_6 {
+  color: #ffad46; }
+.openerp .oe_calendar_table .color_7 {
+  color: #42d692; }
+.openerp .oe_calendar_table .color_8 {
+  color: #16a765; }
+.openerp .oe_calendar_table .color_9 {
+  color: #7bd148; }
+.openerp .oe_calendar_table .color_10 {
+  color: #b3dc6c; }
+.openerp .oe_calendar_table .color_11 {
+  color: #fbe983; }
+.openerp .oe_calendar_table .color_12 {
+  color: #fad165; }
+.openerp .oe_calendar_table .color_13 {
+  color: #92e1c0; }
+.openerp .oe_calendar_table .color_14 {
+  color: #9fe1e7; }
+.openerp .oe_calendar_table .color_15 {
+  color: #9fc6e7; }
+.openerp .oe_calendar_table .color_16 {
+  color: #4986e7; }
+.openerp .oe_calendar_table .color_17 {
+  color: #9a9cff; }
+.openerp .oe_calendar_table .color_18 {
+  color: #b99aff; }
+.openerp .oe_calendar_table .color_19 {
+  color: #c2c2c2; }
+.openerp .oe_calendar_table .color_20 {
+  color: #cabdbf; }
+.openerp .oe_calendar_table .color_21 {
+  color: #cca6ac; }
+.openerp .oe_calendar_table .color_22 {
+  color: #f691b2; }
+.openerp .oe_calendar_table .color_23 {
+  color: #cd74e6; }
+.openerp .oe_calendar_table .color_24 {
+  color: #a47ae2; }
+.openerp .oe_calendar_table .oe_calendar_buttons_add_contact .add_contacts_link_btn {
+  margin-top: 10px; }
diff --git a/addons/web_calendar/static/src/css/web_fullcalendar.sass b/addons/web_calendar/static/src/css/web_fullcalendar.sass
index 460f9878db7..0e2ce4bb49f 100644
--- a/addons/web_calendar/static/src/css/web_fullcalendar.sass
+++ b/addons/web_calendar/static/src/css/web_fullcalendar.sass
@@ -1,5 +1,6 @@
 @charset "utf-8"
 
+
 $color1: #ac725e
 $color2: #d06b64
 $color3: #f83a22
@@ -57,359 +58,364 @@ $fontcolor: #0d0d0d
 img.attendee_head
     height: 18px
     width: 18px
-
-.attendee_head
-    float: right
-    margin-left: 1px
-    size: 18px !important
-
-.cal_avatar
-    height: 24px
-    width: 24px
-    
-.cal_opacity 
-    opacity: 0.6
             
-.event_color_1
-    background-color: $ecolor1
-    color: $fontcolor
-        
-.event_color_2
-    background-color: $ecolor2
-    color: $fontcolor
-        
-.event_color_3
-    background-color: $ecolor3
-    color: $fontcolor
-        
-.event_color_4
-    background-color: $ecolor4
-    color: $fontcolor
-    
-.event_color_5
-    background-color: $ecolor5
-    color: $fontcolor
-    
-.event_color_6
-    background-color: $ecolor6
-    color: $fontcolor
-    
-.event_color_7
-    background-color: $ecolor7
-    color: $fontcolor
-    
-.event_color_8
-    background-color: $ecolor8
-    color: $fontcolor
-    
-.event_color_9
-    background-color: $ecolor9
-    color: $fontcolor
-    
-.event_color_10
-    background-color: $ecolor10
-    color: $fontcolor
-    
-.event_color_11
-    background-color: $ecolor11
-    color: $fontcolor    
-    
-.calendar_color_1
-    border-color: $color1  
-    background-color: $color1
-    color: $fontcolor
-    
-.calendar_color_2
-    border-color: $color2
-    background-color: $color2
-    color: $fontcolor
-    
-.calendar_color_3
-    border-color: $color3
-    background-color: $color3
-    color: $fontcolor
-    
-.calendar_color_4
-    border-color: $color4
-    background-color: $color4
-    color: $fontcolor
-    
-.calendar_color_5
-    border-color: $color5
-    background-color: $color5
-    color: $fontcolor
-    
-.calendar_color_6
-    border-color: $color6
-    background-color: $color6
-    color: $fontcolor
-    
-.calendar_color_7
-    border-color: $color7
-    background-color: $color7
-    color: $fontcolor
-    
-.calendar_color_8
-    border-color: $color8
-    background-color: $color8
-    color: $fontcolor
-    
-.calendar_color_9
-    border-color: $color9
-    background-color: $color9
-    color: $fontcolor
-    
-.calendar_color_10
-    border-color: $color10
-    background-color: $color10
-    color: $fontcolor
-    
-.calendar_color_11
-    border-color: $color11
-    background-color: $color11
-    color: $fontcolor
-    
-.calendar_color_12
-    border-color: $color12
-    background-color: $color12
-    color: $fontcolor
-        
-.calendar_color_13
-    border-color: $color13
-    background-color: $color13
-    color: $fontcolor
-    
-.calendar_color_14
-    border-color: $color14
-    background-color: $color14
-    color: $fontcolor
-    
-.calendar_color_15
-    border-color: $color15
-    background-color: $color15
-    color: $fontcolor
-    
-.calendar_color_16
-    border-color: $color16
-    background-color: $color16
-    color: $fontcolor
-    
-.calendar_color_17
-    border-color: $color17
-    background-color: $color17
-    color: $fontcolor
-    
-.calendar_color_18
-    border-color: $color18
-    background-color: $color18
-    color: $fontcolor
-    
-.calendar_color_19
-    border-color: $color19
-    background-color: $color19
-    color: $fontcolor
-    
-.calendar_color_20
-    border-color: $color20
-    background-color: $color20
-    color: $fontcolor
-    
-.calendar_color_21
-    border-color: $color21
-    background-color: $color21
-    color: $fontcolor
-    
-.calendar_color_22
-    border-color: $color22
-    background-color: $color22
-    color: $fontcolor
-    
-.calendar_color_23
-    border-color: $color23
-    background-color: $color23
-    color: $fontcolor
+.openerp .oe_calendar_table
+    .attendee_head
+        float: right
+        margin-left: 1px
+        size: 18px !important
 
-.calendar_color_24
-    border-color: $color24
-    background-color: $color24
-    color: $fontcolor
-
-
-
-.underline_ecolor_1
-    border-bottom: 4px solid $ecolor1
-    
-.underline_ecolor_2
-    border-bottom: 4px solid $ecolor2
-    
-.underline_ecolor_3
-    border-bottom: 4px solid $ecolor3
-    
-.underline_ecolor_4
-    border-bottom: 4px solid $ecolor4
-    
-.underline_ecolor_5
-    border-bottom: 4px solid $ecolor5
-    
-.underline_ecolor_6
-    border-bottom: 4px solid $ecolor6
-    
-.underline_ecolor_7
-    border-bottom: 4px solid $ecolor7
-    
-.underline_ecolor_8
-    border-bottom: 4px solid $ecolor8
-    
-.underline_ecolor_9
-    border-bottom: 4px solid $ecolor9
-    
-.underline_ecolor_10
-    border-bottom: 4px solid $ecolor10
-    
-.underline_ecolor_11
-    border-bottom: 4px solid $ecolor11
-    
+    .cal_avatar
+        height: 24px
+        width: 24px
         
-.underline_color_1
-    border-bottom: 4px solid $color1
-    
-.underline_color_2
-    border-bottom: 4px solid $color2
-    
-.underline_color_3
-    border-bottom: 4px solid $color3
-    
-.underline_color_4
-    border-bottom: 4px solid $color4
-    
-.underline_color_5
-    border-bottom: 4px solid $color5
-    
-.underline_color_6
-    border-bottom: 4px solid $color6
-    
-.underline_color_7
-    border-bottom: 4px solid $color7
-    
-.underline_color_8
-    border-bottom: 4px solid $color8
-    
-.underline_color_9
-    border-bottom: 4px solid $color9
-    
-.underline_color_10
-    border-bottom: 4px solid $color10
-    
-.underline_color_11
-    border-bottom: 4px solid $color11
-    
-.underline_color_12
-    border-bottom: 4px solid $color12
+    .cal_opacity 
+        opacity: 0.6
+                
+    .event_color_1
+        background-color: $ecolor1
+        color: $fontcolor
+            
+    .event_color_2
+        background-color: $ecolor2
+        color: $fontcolor
+            
+    .event_color_3
+        background-color: $ecolor3
+        color: $fontcolor
+            
+    .event_color_4
+        background-color: $ecolor4
+        color: $fontcolor
         
-.underline_color_13
-    border-bottom: 4px solid $color13
-    
-.underline_color_14
-    border-bottom: 4px solid $color14
-    
-.underline_color_15
-    border-bottom: 4px solid $color15
-    
-.underline_color_16
-    border-bottom: 4px solid $color16
-    
-.underline_color_17
-    border-bottom: 4px solid $color17
-    
-.underline_color_18
-    border-bottom: 4px solid $color18
-    
-.underline_color_19
-    border-bottom: 4px solid $color19
-    
-.underline_color_20
-    border-bottom: 4px solid $color20
-    
-.underline_color_21
-    border-bottom: 4px solid $color21
-    
-.underline_color_22
-    border-bottom: 4px solid $color22
-    
-.underline_color_23
-    border-bottom: 4px solid $color23
-
-.underline_color_24
-    border-bottom: 4px solid $color24
-      
-.color_1
-    color: $color1
-    
-.color_2
-    color: $color2
-    
-.color_3
-    color: $color3
-    
-.color_4
-    color: $color4
-    
-.color_5
-    color: $color5
-    
-.color_6
-    color: $color6
-    
-.color_7
-    color: $color7
-    
-.color_8
-    color: $color8
-    
-.color_9
-    color: $color9
-    
-.color_10
-    color: $color10
-    
-.color_11
-    color: $color11
-    
-.color_12
-    color: $color12
+    .event_color_5
+        background-color: $ecolor5
+        color: $fontcolor
         
-.color_13
-    color: $color13
+    .event_color_6
+        background-color: $ecolor6
+        color: $fontcolor
+        
+    .event_color_7
+        background-color: $ecolor7
+        color: $fontcolor
+        
+    .event_color_8
+        background-color: $ecolor8
+        color: $fontcolor
+        
+    .event_color_9
+        background-color: $ecolor9
+        color: $fontcolor
+        
+    .event_color_10
+        background-color: $ecolor10
+        color: $fontcolor
+        
+    .event_color_11
+        background-color: $ecolor11
+        color: $fontcolor    
+        
+    .calendar_color_1
+        border-color: $color1  
+        background-color: $color1
+        color: $fontcolor
+        
+    .calendar_color_2
+        border-color: $color2
+        background-color: $color2
+        color: $fontcolor
+        
+    .calendar_color_3
+        border-color: $color3
+        background-color: $color3
+        color: $fontcolor
+        
+    .calendar_color_4
+        border-color: $color4
+        background-color: $color4
+        color: $fontcolor
+        
+    .calendar_color_5
+        border-color: $color5
+        background-color: $color5
+        color: $fontcolor
+        
+    .calendar_color_6
+        border-color: $color6
+        background-color: $color6
+        color: $fontcolor
+        
+    .calendar_color_7
+        border-color: $color7
+        background-color: $color7
+        color: $fontcolor
+        
+    .calendar_color_8
+        border-color: $color8
+        background-color: $color8
+        color: $fontcolor
+        
+    .calendar_color_9
+        border-color: $color9
+        background-color: $color9
+        color: $fontcolor
+        
+    .calendar_color_10
+        border-color: $color10
+        background-color: $color10
+        color: $fontcolor
+        
+    .calendar_color_11
+        border-color: $color11
+        background-color: $color11
+        color: $fontcolor
+        
+    .calendar_color_12
+        border-color: $color12
+        background-color: $color12
+        color: $fontcolor
+            
+    .calendar_color_13
+        border-color: $color13
+        background-color: $color13
+        color: $fontcolor
+        
+    .calendar_color_14
+        border-color: $color14
+        background-color: $color14
+        color: $fontcolor
+        
+    .calendar_color_15
+        border-color: $color15
+        background-color: $color15
+        color: $fontcolor
+        
+    .calendar_color_16
+        border-color: $color16
+        background-color: $color16
+        color: $fontcolor
+        
+    .calendar_color_17
+        border-color: $color17
+        background-color: $color17
+        color: $fontcolor
+        
+    .calendar_color_18
+        border-color: $color18
+        background-color: $color18
+        color: $fontcolor
+        
+    .calendar_color_19
+        border-color: $color19
+        background-color: $color19
+        color: $fontcolor
+        
+    .calendar_color_20
+        border-color: $color20
+        background-color: $color20
+        color: $fontcolor
+        
+    .calendar_color_21
+        border-color: $color21
+        background-color: $color21
+        color: $fontcolor
+        
+    .calendar_color_22
+        border-color: $color22
+        background-color: $color22
+        color: $fontcolor
+        
+    .calendar_color_23
+        border-color: $color23
+        background-color: $color23
+        color: $fontcolor
     
-.color_14
-    color: $color14
+    .calendar_color_24
+        border-color: $color24
+        background-color: $color24
+        color: $fontcolor
     
-.color_15
-    color: $color15
     
-.color_16
-    color: $color16
     
-.color_17
-    color: $color17
+    .underline_ecolor_1
+        border-bottom: 4px solid $ecolor1
+        
+    .underline_ecolor_2
+        border-bottom: 4px solid $ecolor2
+        
+    .underline_ecolor_3
+        border-bottom: 4px solid $ecolor3
+        
+    .underline_ecolor_4
+        border-bottom: 4px solid $ecolor4
+        
+    .underline_ecolor_5
+        border-bottom: 4px solid $ecolor5
+        
+    .underline_ecolor_6
+        border-bottom: 4px solid $ecolor6
+        
+    .underline_ecolor_7
+        border-bottom: 4px solid $ecolor7
+        
+    .underline_ecolor_8
+        border-bottom: 4px solid $ecolor8
+        
+    .underline_ecolor_9
+        border-bottom: 4px solid $ecolor9
+        
+    .underline_ecolor_10
+        border-bottom: 4px solid $ecolor10
+        
+    .underline_ecolor_11
+        border-bottom: 4px solid $ecolor11
+        
+            
+    .underline_color_1
+        border-bottom: 4px solid $color1
+        
+    .underline_color_2
+        border-bottom: 4px solid $color2
+        
+    .underline_color_3
+        border-bottom: 4px solid $color3
+        
+    .underline_color_4
+        border-bottom: 4px solid $color4
+        
+    .underline_color_5
+        border-bottom: 4px solid $color5
+        
+    .underline_color_6
+        border-bottom: 4px solid $color6
+        
+    .underline_color_7
+        border-bottom: 4px solid $color7
+        
+    .underline_color_8
+        border-bottom: 4px solid $color8
+        
+    .underline_color_9
+        border-bottom: 4px solid $color9
+        
+    .underline_color_10
+        border-bottom: 4px solid $color10
+        
+    .underline_color_11
+        border-bottom: 4px solid $color11
+        
+    .underline_color_12
+        border-bottom: 4px solid $color12
+            
+    .underline_color_13
+        border-bottom: 4px solid $color13
+        
+    .underline_color_14
+        border-bottom: 4px solid $color14
+        
+    .underline_color_15
+        border-bottom: 4px solid $color15
+        
+    .underline_color_16
+        border-bottom: 4px solid $color16
+        
+    .underline_color_17
+        border-bottom: 4px solid $color17
+        
+    .underline_color_18
+        border-bottom: 4px solid $color18
+        
+    .underline_color_19
+        border-bottom: 4px solid $color19
+        
+    .underline_color_20
+        border-bottom: 4px solid $color20
+        
+    .underline_color_21
+        border-bottom: 4px solid $color21
+        
+    .underline_color_22
+        border-bottom: 4px solid $color22
+        
+    .underline_color_23
+        border-bottom: 4px solid $color23
     
-.color_18
-    color: $color18
+    .underline_color_24
+        border-bottom: 4px solid $color24
+          
+    .color_1
+        color: $color1
+        
+    .color_2
+        color: $color2
+        
+    .color_3
+        color: $color3
+        
+    .color_4
+        color: $color4
+        
+    .color_5
+        color: $color5
+        
+    .color_6
+        color: $color6
+        
+    .color_7
+        color: $color7
+        
+    .color_8
+        color: $color8
+        
+    .color_9
+        color: $color9
+        
+    .color_10
+        color: $color10
+        
+    .color_11
+        color: $color11
+        
+    .color_12
+        color: $color12
+            
+    .color_13
+        color: $color13
+        
+    .color_14
+        color: $color14
+        
+    .color_15
+        color: $color15
+        
+    .color_16
+        color: $color16
+        
+    .color_17
+        color: $color17
+        
+    .color_18
+        color: $color18
+        
+    .color_19
+        color: $color19
+        
+    .color_20
+        color: $color20
+        
+    .color_21
+        color: $color21
+        
+    .color_22
+        color: $color22
+        
+    .color_23
+        color: $color23
     
-.color_19
-    color: $color19
-    
-.color_20
-    color: $color20
-    
-.color_21
-    color: $color21
-    
-.color_22
-    color: $color22
-    
-.color_23
-    color: $color23
-
-.color_24
-    color: $color24
\ No newline at end of file
+    .color_24
+        color: $color24
+        
+    .oe_calendar_buttons_add_contact
+        .add_contacts_link_btn
+            margin-top: 10px    
\ No newline at end of file
diff --git a/addons/web_calendar/static/src/js/fullcalendar.js b/addons/web_calendar/static/src/js/web_calendar.js
similarity index 92%
rename from addons/web_calendar/static/src/js/fullcalendar.js
rename to addons/web_calendar/static/src/js/web_calendar.js
index aac81398a6f..b051bd33a29 100644
--- a/addons/web_calendar/static/src/js/fullcalendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -28,16 +28,16 @@ openerp.web_calendar = function(instance) {
         return typeof id == "string" && id.indexOf('-') >= 0;
     }
 
-    function isNull(value) {
-        return typeof value === "undefined" || value === null
+    function isNullOrUndef(value) {
+        return _.isUndefined(value) || _.isNull(value)
     }
     
-    instance.web.views.add('calendar', 'instance.web_calendar.FullCalendarView');
+    instance.web.views.add('calendar', 'instance.web_calendar.CalendarView');
 
-    instance.web_calendar.FullCalendarView = instance.web.View.extend({
-        template: "FullCalendarView",
+    instance.web_calendar.CalendarView = instance.web.View.extend({
+        template: "CalendarView",
         display_name: _lt('Calendar'),
-        quick_create_class: 'instance.' + 'web_calendar.QuickCreate',
+        quick_create_instance: 'instance.web_calendar.QuickCreate',
 
         init: function (parent, dataset, view_id, options) {
             this._super(parent);
@@ -58,7 +58,6 @@ openerp.web_calendar = function(instance) {
         set_default_options: function(options) {
             this._super(options);
             _.defaults(this.options, {
-                // All possible views options should be defaulted here
                 confirm_on_delete: true,
             });
         },
@@ -72,7 +71,7 @@ openerp.web_calendar = function(instance) {
         view_loading: function (fv) {
             var self = this;
             this.fields_view = fv;
-            this.$calendar = this.$el.find(".oe_fullcalendar_widget");
+            this.$calendar = this.$el.find(".oe_calendar_widget");
 
             this.info_fields = [];
 
@@ -110,37 +109,36 @@ openerp.web_calendar = function(instance) {
             this.how_display_event = '';
            
 
-            if (!isNull(attrs.quick_create_instance)) 
-                self.quick_create_class = 'instance.' + attrs.quick_create_instance;                
+            if (!isNullOrUndef(attrs.quick_create_instance)) {
+                self.quick_create_instance = 'instance.' + attrs.quick_create_instance;                
+            }
                 
-            if (!isNull(attrs.quick_add) && attrs.quick_add == "True")
-                this.quick_add_pop = true; 
-            else
-                this.quick_add_pop = false;
-            
+            //if quick_add = False, we don't allow quick_add
+            //if quick_add = not specified in view, we use the default quick_create_instance
+            //if quick_add = is NOT False and IS specified in view, we this one for quick_create_instance'            
+            this.quick_add_pop = (isNullOrUndef(attrs.quick_add) || attrs.quick_add != "False");
+            if (this.quick_add_pop && !isNullOrUndef(attrs.quick_add)) {
+                self.quick_create_instance = 'instance.' + attrs.quick_add;                
+            }
             // The display format which will be used to display the event where fields are between "[" and "]"
-            if (!isNull(attrs.display))
+            if (!isNullOrUndef(attrs.display)) {
                 this.how_display_event = attrs.display; // String with [FIELD]
+            }
             
             // If this field is set ot true, we don't open the event in form view, but in a popup with the view_id passed by this parameter
-            if (isNull(attrs.event_open_popup) || attrs.event_open_popup == "False")
+            if (isNullOrUndef(attrs.event_open_popup) || attrs.event_open_popup == "False") {
                 this.open_popup_action = false; 
+            }
             else {
                 this.open_popup_action = attrs.event_open_popup;
             }
             
             // If this field is set to true, we will use de calendar_friends model as filter and not the color field.
-            if (!isNull(attrs.use_contacts) && attrs.use_contacts == "True")
-                this.useContacts = true; 
-            else
-                this.useContacts = false;
+            this.useContacts = (!isNullOrUndef(attrs.use_contacts) && attrs.use_contacts == "True"); 
 
             // If this field is set ot true, we don't add itself as an attendee when we use attendee_people to add each attendee icon on an event
             // The color is the color of the attendee, so don't need to show again that it will be present
-            if (isNull(attrs.color_is_attendee) || attrs.color_is_attendee == "False")
-                this.colorIsAttendee = false; 
-            else
-                this.colorIsAttendee = true;
+            this.colorIsAttendee = (!(isNullOrUndef(attrs.color_is_attendee) || attrs.color_is_attendee == "False")); 
                 
 /*
             Will be more logic to do it in futur, but see below to stay Retro-compatible
@@ -157,15 +155,14 @@ openerp.web_calendar = function(instance) {
                 }
             }            
 */
-            if (isNull(attrs.avatar_model)) {
+            if (isNullOrUndef(attrs.avatar_model)) {
                 this.avatar_model = null; 
             }
             else {
                 this.avatar_model = attrs.avatar_model;
             }
-
            
-            if (isNull(attrs.avatar_title)) {
+            if (isNullOrUndef(attrs.avatar_title)) {
                 this.avatar_title = this.avatar_model; 
             }
             else {
@@ -190,7 +187,7 @@ openerp.web_calendar = function(instance) {
                 .call("check_access_rights", ["create", false])
                 .then(function (create_right) {
                     self.create_right = create_right;
-                    self.init_fullcalendar().then(function() {    
+                    self.init_calendar().then(function() {    
                         self.trigger('calendar_view_loaded', fv);
                         self.ready.resolve();
                     });
@@ -198,6 +195,7 @@ openerp.web_calendar = function(instance) {
         },
 
         get_fc_init_options: function () {
+            //Documentation here : http://arshaw.com/fullcalendar/docs/
             var self = this;
             return $.extend({}, fc_defaultOptions, {
                 
@@ -257,8 +255,6 @@ openerp.web_calendar = function(instance) {
                     var stored_data = $(this).data('eventDefaults');
 
                     data_template = $.extend({}, stored_data, data_template);
-
-                    // Opening quick create widget
                     self.open_quick_create(data_template);
                 },
                 unselectAuto: false,
@@ -274,11 +270,8 @@ openerp.web_calendar = function(instance) {
                             // for all other views
                             '': 'h(:mm)tt'            // 7pm
                         },
-                firstHour: 8,
                 weekMode : 'liquid',
                 aspectRatio: 1.8,
-                
-
             });
         },
 
@@ -299,14 +292,13 @@ openerp.web_calendar = function(instance) {
             }
         },              
         
-        init_fullcalendar: function() {
+        init_calendar: function() {
             var self = this;
              
             if (!this.sidebar && this.options.$sidebar) {
                 this.sidebar = new instance.web_calendar.Sidebar(this);
                 this.sidebar.appendTo(this.$el.find('.oe_calendar_sidebar_container'));
-                
-                //Initialize small calendar
+
                 this.$small_calendar = self.$el.find(".oe_calendar_mini");
                 this.$small_calendar.datepicker({ onSelect: self.calendarMiniChanged(self) });
             
@@ -318,20 +310,20 @@ openerp.web_calendar = function(instance) {
                                 var filter_value = result.partner_id[0];
                                 var filter_item = {
                                         value: filter_value,
-                                        label: result.partner_id[1] + " [Me]",
+                                        label: result.partner_id[1] + _lt(" [Me]"),
                                         color: self.get_color(filter_value),
                                         avatar_model: self.avatar_model
                                     };
                                 sidebar_items[filter_value] = filter_item ;
                                 filter_item = {
                                         value: -1,
-                                        label: "All...",
+                                        label: _lt("All..."),
                                         color: self.get_color(-1),
                                         avatar_model: self.avatar_model
                                     };
                                 sidebar_items[-1] = filter_item ;
 
-                                new instance.web.Model("web_calendar.contacts").query(["partner_id"]).filter([["user_id", "=",self.dataset.context.uid]]).all().then(function(result) {
+                                new instance.web.Model("calendar.contacts").query(["partner_id"]).filter([["user_id", "=",self.dataset.context.uid]]).all().then(function(result) {
                                     _.each(result, function(item) {
                                         filter_value = item.partner_id[0];
                                         filter_item = {
@@ -364,16 +356,16 @@ openerp.web_calendar = function(instance) {
         },
 
         open_quick_create: function(data_template) {
-            if (!isNull(this.quick)) {
+            if (!isNullOrUndef(this.quick)) {
                 return this.quick.trigger('close');
             }
-            var QuickCreate = get_class(this.quick_create_class);
+            var QuickCreate = get_class(this.quick_create_instance);
             
             this.options.disable_quick_create =  this.options.disable_quick_create || !this.quick_add_pop;
             
             this.quick = new QuickCreate(this, this.dataset, true, this.options, data_template);
-            this.quick.on('added', this, this.proxy('quick_created'))
-                    .on('slowadded', this, this.proxy('slow_created'))
+            this.quick.on('added', this, this.quick_created)
+                    .on('slowadded', this, this.slow_created)
                     .on('close', this, function() {
                         this.quick.destroy();
                         delete this.quick;
@@ -390,11 +382,12 @@ openerp.web_calendar = function(instance) {
          */
         refresh_event: function(id) {
             var self = this;
-            if (is_virtual_id(id))
+            if (is_virtual_id(id)) {
                 // Should avoid "refreshing" a virtual ID because it can't
                 // really be modified so it should never be refreshed. As upon
                 // edition, a NEW event with a non-virtual id will be created.
                 console.warn("Unwise use of refresh_event on a virtual ID.");
+            }
             this.dataset.read_ids([id], _.keys(this.fields)).done(function (incomplete_records) {
                 self.perform_necessary_name_gets(incomplete_records).then(function(records) {
                     // Event boundaries were already changed by fullcalendar, but we need to reload them:
@@ -444,12 +437,14 @@ openerp.web_calendar = function(instance) {
                 to_get[fieldname] = [];
                 _(evts).each(function (evt) {
                     var value = evt[fieldname];
-                    if (value === false || (value instanceof Array))
+                    if (value === false || (value instanceof Array)) {
                         return;
+                    }
                     to_get[fieldname].push(value);
                 });
-                if (to_get[fieldname].length === 0)
+                if (to_get[fieldname].length === 0) {
                     delete to_get[fieldname];
+                }
             });
             var defs = _(to_get).map(function (ids, fieldname) {
                 return (new instance.web.Model(self.fields[fieldname].relation))
@@ -478,8 +473,9 @@ openerp.web_calendar = function(instance) {
        
         isInArray: function(array_is, array_in) {
             for(var z=0; z<array_is.length; z++){
-              if( array_in.indexOf(array_is[z]) !== -1) 
+              if( array_in.indexOf(array_is[z]) !== -1) {
                   return true;
+              }
             }
             return false;
         },            
@@ -510,20 +506,26 @@ openerp.web_calendar = function(instance) {
                 _.each(this.info_fields, function (fieldname) {
                     var value = evt[fieldname];
                     if (_.contains(["many2one", "one2one"], self.fields[fieldname].type)) {
-                        if (value === false)
+                        if (value === false) {
                             temp_ret[fieldname] = null;
-                        else if (value instanceof Array) 
+                        }
+                        else if (value instanceof Array) {
                             temp_ret[fieldname] = value[1]; // no name_get to make
-                        else
+                        }
+                        else {
                             throw new Error("Incomplete data received from dataset for record " + evt.id);
+                        }
                     }
                     else if (_.contains(["one2many","many2many"], self.fields[fieldname].type)) {
-                        if (value === false) 
+                        if (value === false) {
                             temp_ret[fieldname] = null;
-                        else if (value instanceof Array) 
+                        }
+                        else if (value instanceof Array)  {
                             temp_ret[fieldname] = value; // if x2many, keep all id !
-                        else
+                        }
+                        else {
                             throw new Error("Incomplete data received from dataset for record " + evt.id);
+                        }
                     }
                     else {
                         temp_ret[fieldname] = value;
@@ -540,11 +542,12 @@ openerp.web_calendar = function(instance) {
                     _.each(temp_ret, function(val,key) { res_text.push(val)} );
                     the_title = res_text.join(', ');                    
                 }
-                the_title = the_title.replace(/&/g,'&amp;').replace(/</g,'&lt;'); //.replace(/>/g,'&gt;');
+                the_title = _.escape(the_title);
+                
                 
                 the_title_avatar = '';
                 
-                if (typeof this.attendee_people !== "undefined") {
+                if (! _.isUndefined(this.attendee_people)) {
                     var MAX_ATTENDEES = 3;
                     var attendee_showed = 0;
                     var attendee_other = '';
@@ -631,12 +634,11 @@ openerp.web_calendar = function(instance) {
 
             if (event.allDay) {
                 // Sometimes fullcalendar doesn't give any event.end.
-                if (event_end === null || typeof event_end === "undefined")
+                if (event_end === null || _.isUndefined(event_end)) {
                     event_end = new Date(event.start);
-                // Avoid inplace changes
-                
+                }
                 if (this.all_day) {
-                    event_end = (new Date(event_end.getTime())).addDays(1); //midnight to midnight
+                    event_end = (new Date(event_end.getTime())).addDays(1); 
                     date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate()))
                     date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate()))            
                 }
@@ -672,8 +674,9 @@ openerp.web_calendar = function(instance) {
         },
         do_search: function(domain, context, _group_by) {
             var self = this;
-            if (typeof this.event_source !== "undefined")
+            if (! _.isUndefined(this.event_source)) {
                 this.$calendar.fullCalendar('removeEventSource', this.event_source);
+            }
             this.event_source = {
                 events: function(start, end, callback) {
                     var current_event_source = self.event_source;
@@ -683,7 +686,6 @@ openerp.web_calendar = function(instance) {
                         context: context,
                     }).done(function(events) {
                         if (self.event_source !== current_event_source) {
-                            // Event source changed while waiting for AJAX response
                             console.log("Consecutive ``do_search`` called. Cancelling.");
                             return;
                         }
@@ -692,7 +694,7 @@ openerp.web_calendar = function(instance) {
                         events = $.map(events, function (e) {
                             
                             if (self.attendee_people != undefined) { //If we filter on contacts...
-                                if (self.isInArray(self.selected_filters,e[self.attendee_people]) || (self.selected_filters.indexOf(-1) > -1)) {
+                                if (_.intersection(self.selected_filters,e[self.attendee_people]).length || (self.selected_filters.indexOf(-1) > -1)) {
                                     return e;
                                 }
                                 else {
@@ -705,8 +707,6 @@ openerp.web_calendar = function(instance) {
                             return null;                            
                         });
                         
-                        
-                        
                         if (!self.useContacts) {  // If we use all peoples as filter in sidebars
                             var now_filters = {};
                             var filter_value;
@@ -720,8 +720,9 @@ openerp.web_calendar = function(instance) {
                                     color: self.get_color(filter_value),
                                     avatar_model: self.avatar_model
                                 };
-                                if (!now_filters[e[self.color_field][0]]) 
+                                if (!now_filters[e[self.color_field][0]]) {
                                     now_filters[e[self.color_field][0]] = filter_item;
+                                }
                             });
                             
                             self.allFilters = now_filters;
@@ -872,8 +873,9 @@ openerp.web_calendar = function(instance) {
             return this._super();
         },
         is_action_enabled: function(action) {
-            if (action === 'create' && !this.options.creatable)
+            if (action === 'create' && !this.options.creatable) {
                 return false;
+            }
             return this._super(action);
         },
 
@@ -892,7 +894,6 @@ openerp.web_calendar = function(instance) {
              * trigger action upon modification.
              */
             this.dataset.ids = this.dataset.ids.concat([id]);
-            // Inform every body that dataset changed
             this.dataset.trigger("dataset_changed", id);
             this.refresh_event(id);
         },
@@ -942,10 +943,10 @@ openerp.web_calendar = function(instance) {
         },
         get_title: function () {
             var parent = this.getParent();
-            if (typeof parent === 'undefined') {
+            if (_.isUndefined(parent)) {
                 return _t("Create")
             }
-            var title = (typeof parent.field_widget === "undefined") ?
+            var title = (_.isUndefined(parent.field_widget)) ?
                     (parent.string || parent.name) :
                     parent.field_widget.string || parent.field_widget.name || '';
             return _t("Create: ") + title;
@@ -1010,7 +1011,9 @@ openerp.web_calendar = function(instance) {
          */
         quick_add: function() {
             var val = this.$input.val();
-            if (/^\s*$/.test(val)) { return false; }
+            if (/^\s*$/.test(val)) { 
+                return false; 
+            }
             return this.quick_create({'name': val}).always(function() { return true });
         },
         
@@ -1044,7 +1047,7 @@ openerp.web_calendar = function(instance) {
                 view_id: false,
                 title: this.name,
             };
-            if (typeof parent !== 'undefined' && typeof parent.ViewManager !== 'undefined') {
+            if (!_.isUndefined(parent) && !(_.isUndefined(parent.ViewManager))) {
                 infos.view_id = parent.ViewManager.get_view_id('form');
             }
             return infos;
@@ -1073,15 +1076,17 @@ openerp.web_calendar = function(instance) {
                 create_function: function(data, options) {
                     return self.dataset.create(data, options).done(function(r) {
                     }).fail(function (r, event) {
-                       if (!r.data.message) //else manage by openerp
+                       if (!r.data.message) { //else manage by openerp
                             throw new Error(r);
+                       }
                     });
                 },
                 read_function: function(id, fields, options) {
                     return self.dataset.read_ids.apply(self.dataset, arguments).done(function() {
                     }).fail(function (r, event) {
-                        if (!r.data.message)  //else manage by openerp
+                        if (!r.data.message) { //else manage by openerp
                             throw new Error(r);
+                        }
                     });
                 },
             });
@@ -1089,8 +1094,9 @@ openerp.web_calendar = function(instance) {
                 // ``self.trigger('close')`` would itself destroy all child element including
                 // the slow create popup, which would then re-trigger recursively the 'closed' signal.  
                 // Thus, here, we use a deferred and its state to cut the endless recurrence.
-                if (def.state() === "pending")
+                if (def.state() === "pending") {
                     def.resolve();
+                }
             });
             pop.on('create_completed', self, function(id) {
                  self.trigger('slowadded');
@@ -1108,10 +1114,11 @@ openerp.web_calendar = function(instance) {
      */
 
     function widget_calendar_lazy_init() {
-        if (instance.web.form.Many2ManyCalendarView)
+        if (instance.web.form.Many2ManyCalendarView) {
             return;
+        }
 
-        instance.web_fullcalendar.FieldFullCalendarView = instance.web_fullcalendar.FullCalendarView.extend({
+        instance.web_calendar.FieldCalendarView = instance.web_calendar.CalendarView.extend({
 
             init: function (parent) {
                 this._super.apply(this, arguments);
@@ -1131,7 +1138,7 @@ openerp.web_calendar = function(instance) {
             // In forms, we could be hidden in a notebook. Thus we couldn't
             // render correctly fullcalendar so we try to detect when we are
             // not visible to wait for when we will be visible.
-            init_fullcalendar: function() {
+            init_calendar: function() {
                 if (this.$calendar.width() !== 0) { // visible
                     return this._super();
                 }
@@ -1166,7 +1173,7 @@ openerp.web_calendar = function(instance) {
             var def = $.Deferred();
             var self = this;
             var create = this._super;
-            if (typeof this.required_fields === "undefined") {
+            if (_.isUndefined(this.required_fields)) {
                 this.required_fields = (new instance.web.Model(this.model))
                     .call('fields_get').then(function (fields_def) {
                         return _(fields_def).chain()
@@ -1181,7 +1188,7 @@ openerp.web_calendar = function(instance) {
             }
             $.when(this.required_fields).then(function (required_fields) {
                 var missing_fields = _(required_fields).filter(function (v) {
-                    return typeof data[v] === "undefined";
+                    return _.isUndefined(data[v]);
                 });
                 var default_get = (missing_fields.length !== 0) ?
                     self.default_get(missing_fields) : [];
@@ -1189,7 +1196,7 @@ openerp.web_calendar = function(instance) {
 
                     // Remove all fields that have a default from the missing fields.
                     missing_fields = _(missing_fields).filter(function (f) {
-                        return typeof defaults[f] === "undefined";
+                        return _.isUndefined(defaults[f]);
                     });
                     if (missing_fields.length !== 0) {
                         def.reject(
@@ -1238,7 +1245,7 @@ openerp.web_calendar = function(instance) {
     instance.web_calendar.FieldCalendar = instance.web.form.AbstractField.extend({
 
         disable_utility_classes: true,
-        fullcalendar_view_class: 'instance.web_calendar.FieldFullCalendarView',
+        calendar_view_class: 'instance.web_calendar.FieldCalendarView',
 
         init: function(field_manager, node) {
             this._super(field_manager, node);
@@ -1282,7 +1289,7 @@ openerp.web_calendar = function(instance) {
 
         load_view: function() {
             var self = this;
-            var calendar_view_class = get_class(this.fullcalendar_view_class);
+            var calendar_view_class = get_class(this.calendar_view_class);
             this.calendar_view = new calendar_view_class(this, this.dataset, false, $.extend({
                 'create_text': _t("Add"),
                 'creatable': self.get("effective_readonly") ? false : true,
@@ -1318,14 +1325,15 @@ openerp.web_calendar = function(instance) {
         },
 
         open_popup: function(type, unused) {
-            if (type !== "form")
-                return;
+            if (type !== "form") { return; }
             if (this.dataset.index === null) {
-                if (typeof this.open_popup_add === "function")
+                if (typeof this.open_popup_add === "function") {
                     this.open_popup_add();
+                }
             } else {
-                if (typeof this.open_popup_edit === "function")
+                if (typeof this.open_popup_edit === "function") {
                     this.open_popup_edit();
+                }
             }
         },
         open_popup_add: function() {
@@ -1482,11 +1490,10 @@ openerp.web_calendar = function(instance) {
         },
         addUpdateButton: function() {
             var self=this;
-            var button = "<button class='oe_button oe_form_button oe_link add_contacts_link_btn' style='margin-top:10px'><span class='add_contacts_link'>See Employee's Meeting</span></button>";
-            this.$('div.oe_calendar_all_responsibles').append(button);
+            this.$('div.oe_calendar_all_responsibles').append(QWeb.render('CalendarView.sidebar.button_add_contact'));
             this.$(".add_contacts_link_btn").on('click', function() {  
                 self.rpc("/web/action/load", { 
-                    action_id: "web_calendar.action_calendar_contacts" 
+                    action_id: "calendar.action_calendar_contacts" 
                 }).then( function(result) { return self.do_action(result); });
             });
             
diff --git a/addons/web_calendar/static/src/xml/web_fullcalendar.xml b/addons/web_calendar/static/src/xml/web_fullcalendar.xml
index 1d81aee1f8f..615599781c1 100644
--- a/addons/web_calendar/static/src/xml/web_fullcalendar.xml
+++ b/addons/web_calendar/static/src/xml/web_fullcalendar.xml
@@ -1,10 +1,10 @@
 <template>
-  <t t-name="FullCalendarView"> 
+  <t t-name="CalendarView"> 
     <table cellspacing="0" cellpadding="0" border="0" width="100%" class="oe_calendar_table">
         <tr>
             <td width="100%">
                 <div class="oe_calendar_view">        
-                  <div class="oe_fullcalendar_widget" />
+                  <div class="oe_calendar_widget" />
                   <div class="oe_calendar_buttons"/>
                   <div class="oe_calendar_qc_placeholder"/>                    
                 </div>                
@@ -53,6 +53,13 @@
       </t>
     </t>
   </div>
+  
+  <div t-name="CalendarView.sidebar.button_add_contact" class="oe_calendar_buttons_add_contact">
+        <button class='oe_button oe_form_button oe_link add_contacts_link_btn' style='margin-top:10px'>
+            <span class='add_contacts_link'>See Employee's Meeting</span>
+        </button>
+  </div>
+
 
   <div t-name="CalendarView.quick_create" class="oe_calendar_quick_create openerp">