diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index e3ea0e030a2..38e7fb99283 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -100,79 +100,80 @@
 
     <data noupdate="1">
         <record id="project_project_data" model="project.project">
-            <field name="name">Discover Odoo</field>
+            <field name="name">Start here to discover Odoo</field>
             <field name="privacy_visibility">followers</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="alias_model">project.task</field>
         </record>
 
         <record id="project_stage_data_1" model="project.task.type">
-            <field name="sequence">1</field>
-            <field name="name">Beginner</field>
-        </record>
-
-        <record id="project_stage_data_2" model="project.task.type">
             <field name="sequence">2</field>
             <field name="name">Basic</field>
         </record>
 
-        <record id="project_stage_data_3" model="project.task.type">
+        <record id="project_stage_data_2" model="project.task.type">
             <field name="sequence">3</field>
             <field name="name">Advanced</field>
         </record>
 
-        <record id="project_task_data_3" model="project.task">
-            <field name="user_id" ref="base.user_root"/>
-            <field name="priority">0</field>
-            <field name="project_id" ref="project.project_project_data"/>
-            <field name="name">Click on me to see what happen</field>
-            <field name="stage_id" ref="project_stage_data_1"/>
-            <field name="color">3</field>
-        </record>
-
-        <record id="project_task_data_2" model="project.task">
-            <field name="user_id" ref="base.user_root"/>
-            <field name="priority">0</field>
-            <field name="project_id" ref="project.project_project_data"/>
-            <field name="name">This is a card</field>
-            <field name="stage_id" ref="project_stage_data_1"/>
-            <field name="color">3</field>
-        </record>
-
-        <record id="project_task_data_1" model="project.task">
+        <record id="project_task_data_0" model="project.task">
+            <field name="sequence">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_data"/>
             <field name="name">Welcome to Odoo</field>
-            <field name="stage_id" ref="project_stage_data_1"/>
-            <field name="color">3</field>
+            <field name="color">2</field>
         </record>
 
-        <record id="project_task_data_6" model="project.task">
+        <record id="project_task_data_1" model="project.task">
+            <field name="sequence">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_data"/>
-            <field name="name">Use colored tags to organize your tasks</field>
-            <field name="stage_id" ref="project_stage_data_2"/>
-            <field name="color">3</field>
+            <field name="name">This is a card</field>
         </record>
 
         <record id="project_task_data_5" model="project.task">
+            <field name="sequence">2</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_data"/>
             <field name="name">Try to drag a task where your want</field>
-            <field name="stage_id" ref="project_stage_data_2"/>
-            <field name="color">3</field>
+            <field name="priority">1</field>
+            <field name="kanban_state">done</field>
         </record>
 
         <record id="project_task_data_4" model="project.task">
             <field name="user_id" ref="base.user_root"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_data"/>
-            <field name="name">Invite someone by adding him in the followers list</field>
+            <field name="name">Use the chatter to collaborate with your members</field>
             <field name="stage_id" ref="project_stage_data_2"/>
-            <field name="color">3</field>
+        </record>
+
+        <record id="msg_task_4" model="mail.message">
+            <field name="subject">Converse with your customers and colleagues</field>
+            <field name="model">project.task</field>
+            <field name="author_id" ref="base.user_root"/>
+            <field name="res_id" ref="project_task_data_4"/>
+            <field name="body">Use this chatter to send emails.\n Add new people in the followers list, to make them aware about the main changes about this task !</field>
+            <field name="message_type">email</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+        </record>
+
+        <record id="project_tag_data" model="project.tags">
+            <field name="name">NeedAssistance</field>
+        </record>
+
+        <record id="project_task_data_6" model="project.task">
+            <field name="sequence">3</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="priority">0</field>
+            <field name="project_id" ref="project.project_project_data"/>
+            <field name="name">Use tags to organize your tasks</field>
+            <field name="kanban_state">blocked</field>
+            <field name="stage_id" ref="project_stage_data_1"/>
+            <field name="tag_ids" eval="[(6,0,[ref('project.project_tag_data')])]"/>
         </record>
 
         <record id="project_task_data_8" model="project.task">
@@ -180,18 +181,36 @@
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_data"/>
             <field name="name">Do you want to learn more ? Try our planner !</field>
-            <field name="stage_id" ref="project_stage_data_3"/>
-            <field name="color">3</field>
+            <field name="stage_id" ref="project_stage_data_2"/>
             <field name="description">Click on the bar in the upper right corner</field>
         </record>
 
+        <record id="msg_task_data_8_attach" model="ir.attachment">
+            <field name="name">planner_icon.png</field>
+            <field name="datas_fname">planner_icon.png</field>
+            <field name="datas" type="base64" file="project/static/src/img/planner_icon.png"></field>
+            <field name="res_model">project.task</field>
+            <field name="res_id" ref="project_task_data_8"/>
+        </record>
+        
+        <record id="msg_case15_2" model="mail.message">
+            <field name="subject">How to open the planner ?</field>
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_data_8"/>
+            <field name="author_id" ref="base.user_root"/>
+            <field name="body"><![CDATA[Click on this icon in the upper right corner to open the planner<br/>
+            Best regards,<br/>Me.</p>]]></field>
+            <field name="message_type">comment</field>
+            <field name="attachment_ids" eval="[(6, 0, [ref('msg_task_data_8_attach')])]"/>
+        </record>
+
         <record id="project_task_data_7" model="project.task">
             <field name="user_id" ref="base.user_root"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_data"/>
             <field name="name">Finished with your card ? Archive it !</field>
-            <field name="stage_id" ref="project_stage_data_3"/>
             <field name="color">3</field>
+            <field name="stage_id" ref="project_stage_data_2"/>
         </record>
 
         <record id="project_task_data_9" model="project.task">
@@ -199,17 +218,25 @@
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_data"/>
             <field name="name">You want to add a stage ? Add a new column !</field>
-            <field name="stage_id" ref="project_stage_data_3"/>
-            <field name="color">3</field>
+            <field name="stage_id" ref="project_stage_data_2"/>
         </record>
 
         <record id="project_task_data_10" model="project.task">
             <field name="user_id" ref="base.user_root"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_data"/>
-            <field name="name">Use the chatter to collaborate with your members</field>
-            <field name="stage_id" ref="project_stage_data_3"/>
-            <field name="color">3</field>
+            <field name="name">Send an email in the chatter with an attachment to see what happen !</field>
+            <field name="stage_id" ref="project_stage_data_1"/>
         </record>
+
+        <record id="project_task_data_11" model="project.task">
+            <field name="user_id" ref="base.user_root"/>
+            <field name="priority">0</field>
+            <field name="project_id" ref="project.project_project_data"/>
+            <field name="name">You can set a deadline on a task</field>
+            <field name="stage_id" ref="project_stage_data_1"/>
+            <field name="date_deadline" eval="'2015-%s-01' %(datetime.now().month+1)"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project/project_tip_data.xml b/addons/project/project_tip_data.xml
index d610c0e398f..a612bb3f5f9 100644
--- a/addons/project/project_tip_data.xml
+++ b/addons/project/project_tip_data.xml
@@ -11,17 +11,6 @@
         <field name="placement">bottom</field>
     </record>
     
-    <record model="web.tip" id="project_tip_2">
-        <field name="description">You can drag and drop tasks from one stage to another.</field>
-        <field name="action_id" ref="action_view_task"/> 
-        <field name="model">project.task</field>
-        <field name="mode">kanban</field>
-        <field name="trigger_selector">.oe_kanban_content:visible</field>
-        <field name="highlight_selector">.oe_kanban_content:visible</field>
-        <field name="end_event">mousedown</field>
-        <field name="placement">top</field>
-    </record>
-    
     <record model="web.tip" id="project_tip_3">
         <field name="description">Every event on a task is logged in this section. Send a new message to notify followers or log an internal note to store information without notifying the followers.</field>
         <field name="action_id" ref="action_view_task"/>
diff --git a/addons/project/static/src/img/planner_icon.png b/addons/project/static/src/img/planner_icon.png
new file mode 100644
index 00000000000..6d6d7c941a7
Binary files /dev/null and b/addons/project/static/src/img/planner_icon.png differ