diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 27eccf020b2..729d3ef7b4c 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -69,7 +69,7 @@
                         <t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
                         <img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
                         <div class="oe_module_desc">
-                          <h4><a type="edit"><field name="shortdesc"/></a></h4>
+                          <h4><a type="open"><field name="shortdesc"/></a></h4>
                           <p class="oe_module_name">
                              <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
                              <i><field name="name" groups="base.group_no_one"/></i>
diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 93d12228ebe..f282466b989 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -227,10 +227,35 @@ class res_partner(osv.osv):
 
     def _get_default_image(self, cr, uid, is_company, context=None):
         if is_company:
-            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')
+            image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
         else:
-            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'partner_image.png')
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+<<<<<<< TREE
+            from PIL import Image
+            from StringIO import StringIO
+            from random import random
+            color = (int(random() * 192 + 32), int(random() * 192 + 32), int(random() * 192 + 32))
+            face = Image.open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png'))
+            avatar = Image.new('RGB', face.size)
+            avatar.paste(color)
+            avatar.paste(face, mask=face)
+            buffer = StringIO()
+            avatar.save(buffer, 'PNG')
+            image = buffer.getvalue()
+        return tools.image_resize_image_big(image.encode('base64'))
+=======
+            from PIL import Image
+            from StringIO import StringIO
+            from random import random
+            color = (int(random() * 256), int(random() * 256), int(random() * 256))
+            face = open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read()
+            avatar = Image.new('RGB', face.size)
+            avatar.paste(color)
+            avatar.paste(face, mask=face)
+            buffer = StringIO()
+            avatar.save(buffer, 'PNG')
+            image = buffer.getvalue()
+        return tools.image_resize_image_big(image.encode('base64'))
+>>>>>>> MERGE-SOURCE
 
     _defaults = {
         'active': True,
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 92a264f0089..7e70e68c35c 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -176,7 +176,7 @@
                                             <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
                                                 <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
                                                 <div class="oe_module_vignette">
-                                                <a type="edit">
+                                                <a type="open">
                                                     <img t-att-src="kanban_image('res.partner', 'image', record.id.value, {'preview_image': 'image_small'})" class="oe_avatar oe_kanban_avatar_smallbox"/>
                                                 </a>
                                                     <div class="oe_module_desc">
@@ -184,7 +184,7 @@
                                                             <table class="oe_kanban_table">
                                                                 <tr>
                                                                     <td class="oe_kanban_title1" align="left" valign="middle">
-                                                                        <h4><a type="edit"><field name="name"/></a></h4>
+                                                                        <h4><a type="open"><field name="name"/></a></h4>
                                                                         <i><div t-if="record.function.raw_value">
                                                                             <field name="function"/><br/></div></i>
                                                                     </td>
@@ -302,11 +302,11 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_vignette">
-                                <a type="edit">
+                                <a type="open">
                                     <img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_kanban_image"/>
                                 </a>
                                 <div class="oe_kanban_details">
-                                    <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a></h4>
+                                    <h4 class="oe_partner_heading"><a type="open"><field name="name"/></a></h4>
                                     <div class="oe_kanban_partner_categories"/>
                                     <div class="oe_kanban_partner_links"/>
                                     <ul>
diff --git a/openerp/addons/base/static/src/img/avatar.png b/openerp/addons/base/static/src/img/avatar.png
new file mode 100644
index 00000000000..93235db8afa
Binary files /dev/null and b/openerp/addons/base/static/src/img/avatar.png differ
diff --git a/openerp/addons/base/static/src/img/avatar0.png b/openerp/addons/base/static/src/img/avatar0.png
deleted file mode 100644
index 2bcc7c8d2e4..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar0.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar1.png b/openerp/addons/base/static/src/img/avatar1.png
deleted file mode 100644
index 4f6d2f7e818..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar1.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar2.png b/openerp/addons/base/static/src/img/avatar2.png
deleted file mode 100644
index 70d5df7ee60..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar2.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar3.png b/openerp/addons/base/static/src/img/avatar3.png
deleted file mode 100644
index 053768aa035..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar3.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar4.png b/openerp/addons/base/static/src/img/avatar4.png
deleted file mode 100644
index 1b2a99f05c3..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar4.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar5.png b/openerp/addons/base/static/src/img/avatar5.png
deleted file mode 100644
index 0f6c416ecf0..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar5.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar6.png b/openerp/addons/base/static/src/img/avatar6.png
deleted file mode 100644
index d6a18c2779e..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar6.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/partner_image.png b/openerp/addons/base/static/src/img/partner_image.png
deleted file mode 100644
index 87fdbc5af55..00000000000
Binary files a/openerp/addons/base/static/src/img/partner_image.png and /dev/null differ
diff --git a/setup.py b/setup.py
index 77a59d52cf7..a26b74e255d 100755
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ setuptools.setup(
           'docutils',
           'feedparser',
           'gdata',
-          'lxml',
+          'lxml < 3',
           'mako',
           'psycopg2',
           'pydot',