diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 275b8317c0a..c757702d52f 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -25,6 +25,7 @@
     'name': 'Base',
     'version': '1.3',
     'category': 'Generic Modules/Base',
+    'complexity': "easy",
     'description': """The kernel of OpenERP, needed for all installation.""",
     'author': 'OpenERP SA',
     'maintainer': 'OpenERP SA',
diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 3f8208b8ec4..6c073a769a7 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1003,7 +1003,8 @@
 
         <record id="main_partner" model="res.partner">
             <field name="name">OpenERP S.A.</field>
-            <!-- Company ID will be set later -->
+            <!-- Address and Company ID will be set later -->
+            <field name="address" eval="[]"/>
             <field name="company_id" eval="None"/>
         </record>
         <record id="main_address" model="res.partner.address">
diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 0ff3070d44e..034829b82b5 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -197,6 +197,9 @@ class module(osv.osv):
         'views_by_module': fields.function(_get_views, method=True, string='Views', type='text', multi="meta", store=True),
         'certificate' : fields.char('Quality Certificate', size=64, readonly=True),
         'web': fields.boolean('Has a web component', readonly=True),
+        'complexity': fields.selection([('easy','Easy'), ('normal','Normal'), ('expert','Expert')],
+            string='Complexity', readonly=True,
+            help='Level of difficulty of module. Easy: intuitive and easy to use for everyone. Normal: easy to use for business experts. Expert: requires technical skills.'),
     }
 
     _defaults = {
@@ -376,6 +379,7 @@ class module(osv.osv):
             'license': terp.get('license', 'AGPL-3'),
             'certificate': terp.get('certificate') or False,
             'web': terp.get('web') or False,
+            'complexity': terp.get('complexity', ''),
         }
 
     # update the list of available packages
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 2cfd4892180..fe5212a561f 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -46,6 +46,7 @@
                         <filter icon="terp-camera_test" string="Certified" domain="[('certificate','&lt;&gt;', False)]"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
+                        <field name="complexity"/>
                         <field name="description"/>
                         <field name="dependencies_id"/>
                         <field name="state"/>
@@ -90,6 +91,7 @@
                     <field name="certificate" />
                     <field colspan="4" name="shortdesc" select="2"/>
                     <field name="category_id"/>
+                    <field name="complexity"/>
                     <field name="demo" readonly="1"/>
                     <notebook colspan="4">
                         <page string="Module">
@@ -149,6 +151,7 @@
                     <field name="name"/>
                     <field name="category_id"/>
                     <field name="shortdesc"/>
+                    <field name="complexity"/>
                     <field name="author"/>
                     <field name="installed_version"/>
                     <field name="latest_version"/>
diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py
index 091927f126d..ee81d1d10b6 100644
--- a/openerp/addons/base/res/partner/partner.py
+++ b/openerp/addons/base/res/partner/partner.py
@@ -147,9 +147,11 @@ class res_partner(osv.osv):
     _defaults = {
         'active': lambda *a: 1,
         'customer': lambda *a: 1,
+        'address': [{'type': 'default'}],
         'category_id': _default_category,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner', context=c),
     }
+
     def copy(self, cr, uid, id, default={}, context={}):
         name = self.read(cr, uid, [id], ['name'])[0]['name']
         default.update({'name': name+ _(' (copy)'), 'events':[]})
@@ -312,14 +314,13 @@ class res_partner_address(osv.osv):
             if context.get('contact_display', 'contact')=='partner' and r['partner_id']:
                 res.append((r['id'], r['partner_id'][1]))
             else:
-                addr = r['name'] or ''
-                if r['name'] and (r['city'] or r['country_id']):
-                    addr += ', '
-                addr += (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['city'] or '') + ' '  + (r['street'] or '')
+                # make a comma-separated list with the following non-empty elements
+                elems = [r['name'], r['country_id'] and r['country_id'][1], r['city'], r['street']]
+                addr = ', '.join(filter(bool, elems))
                 if (context.get('contact_display', 'contact')=='partner_address') and r['partner_id']:
-                    res.append((r['id'], "%s: %s" % (r['partner_id'][1], addr.strip() or '/')))
+                    res.append((r['id'], "%s: %s" % (r['partner_id'][1], addr or '/')))
                 else:
-                    res.append((r['id'], addr.strip() or '/'))
+                    res.append((r['id'], addr or '/'))
         return res
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
diff --git a/openerp/addons/base/res/partner/partner_demo.xml b/openerp/addons/base/res/partner/partner_demo.xml
index 6f433675767..c98ae837088 100644
--- a/openerp/addons/base/res/partner/partner_demo.xml
+++ b/openerp/addons/base/res/partner/partner_demo.xml
@@ -93,10 +93,12 @@
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_agrolait" model="res.partner">
             <field name="name">Agrolait</field>
             <field eval="[(6, 0, [ref('res_partner_category_8')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_c2c" model="res.partner">
             <field name="name">Camptocamp</field>
@@ -107,6 +109,7 @@
             <field name="website">http://www.syleam.fr</field>
             <field name="name">Syleam</field>
             <field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_thymbra" model="res.partner">
             <field name="name">Thymbra</field>
@@ -116,6 +119,7 @@
             <field name="name">Axelor</field>
             <field eval="[(6, 0, [ref('res_partner_category_4')])]" name="category_id"/>
             <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_tinyatwork" model="res.partner">
             <field name="name">Tiny AT Work</field>
@@ -123,25 +127,30 @@
         </record>
         <record id="res_partner_2" model="res.partner">
             <field name="name">Bank Wealthy and sons</field>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_3" model="res.partner">
             <field name="name">China Export</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_4" model="res.partner">
             <field name="name">Distrib PC</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_5" model="res.partner">
             <field name="name">Ecole de Commerce de Liege</field>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_6" model="res.partner">
             <field name="name">Elec Import</field>
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_maxtor" model="res.partner">
             <field name="name">Maxtor</field>
@@ -149,6 +158,7 @@
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
             <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_seagate" model="res.partner">
             <field name="name">Seagate</field>
@@ -162,6 +172,7 @@
             <field name="name">Mediapole SPRL</field>
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_9" model="res.partner">
             <field name="website">http://balmerinc.com</field>
@@ -170,17 +181,20 @@
             <field name="ref">or</field>
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_1')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_10" model="res.partner">
             <field name="name">Tecsas</field>
             <field name="ean13">3020170000003</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_11" model="res.partner">
             <field name="name">Leclerc</field>
             <field eval="1200.00" name="credit_limit"/>
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_0')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_14" model="res.partner">
             <field name="name">Centrale d'achats BML</field>
@@ -188,6 +202,7 @@
             <field eval="15000.00" name="credit_limit"/>
             <field name="parent_id" ref="res_partner_10"/>
             <field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_15" model="res.partner">
             <field name="name">Magazin BML 1</field>
@@ -196,10 +211,12 @@
             <field eval="1500.00" name="credit_limit"/>
             <field name="user_id" ref="user_demo"/>
             <field eval="[(6, 0, [ref('res_partner_category_11')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
         <record id="res_partner_accent" model="res.partner">
             <field name="name">Université de Liège</field>
             <field eval="[(6, 0, [ref('res_partner_category_9')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
 
     <!--
@@ -210,44 +227,53 @@
             <field eval="'Sprl Dubois would like to sell our bookshelves but they have no storage location, so it would be exclusively on order'" name="comment"/>
             <field model="res.users" name="user_id" search="[('name', '=', u'Thomas Lebrun')]"/>
             <field name="name">Dubois sprl</field>
+            <field name="address" eval="[]"/>
         </record>
 
         <record id="res_partner_ericdubois0" model="res.partner">
             <field name="name">Eric Dubois</field>
+            <field name="address" eval="[]"/>
         </record>
 
         <record id="res_partner_fabiendupont0" model="res.partner">
             <field name="name">Fabien Dupont</field>
+            <field name="address" eval="[]"/>
         </record>
 
         <record id="res_partner_lucievonck0" model="res.partner">
             <field name="name">Lucie Vonck</field>
+            <field name="address" eval="[]"/>
         </record>
 
         <record id="res_partner_notsotinysarl0" model="res.partner">
             <field name="name">NotSoTiny SARL</field>
+            <field name="address" eval="[]"/>
         </record>
 
         <record id="res_partner_theshelvehouse0" model="res.partner">
             <field name="name">The Shelve House</field>
             <field eval="[(6,0,[ref('res_partner_category_retailers0')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
 
         <record id="res_partner_vickingdirect0" model="res.partner">
             <field name="name">Vicking Direct</field>
             <field eval="[(6,0,[ref('res_partner_category_miscellaneoussuppliers0')])]" name="category_id"/>
-                        <field name="supplier">1</field>
+            <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
         </record>
 
         <record id="res_partner_woodywoodpecker0" model="res.partner">
             <field name="name">Wood y Wood Pecker</field>
             <field eval="[(6,0,[ref('res_partner_category_woodsuppliers0')])]" name="category_id"/>
-                        <field name="supplier">1</field>
+            <field name="supplier">1</field>
+            <field name="address" eval="[]"/>
         </record>
 
         <record id="res_partner_zerooneinc0" model="res.partner">
             <field name="name">ZeroOne Inc</field>
             <field eval="[(6,0,[ref('res_partner_category_consumers0')])]" name="category_id"/>
+            <field name="address" eval="[]"/>
         </record>
 
         <!--
@@ -526,12 +552,7 @@
         </record>
 
 
-        <record id="res_partner_address_1" model="res.partner.address">
-            <field name="partner_id" ref="res_partner_fabiendupont0"/>
-        </record>
-
-
-        <record id="res_partner_address_2" model="res.partner.address">
+        <record id="res_partner_address_ericdubois0" model="res.partner.address">
             <field eval="'Mons'" name="city"/>
             <field eval="'7000'" name="zip"/>
             <field name="partner_id" ref="res_partner_ericdubois0"/>
@@ -540,7 +561,7 @@
         </record>
 
 
-        <record id="res_partner_address_3" model="res.partner.address">
+        <record id="res_partner_address_notsotinysarl1" model="res.partner.address">
             <field eval="'Antwerpen'" name="city"/>
             <field eval="'2000'" name="zip"/>
             <field name="partner_id" ref="res_partner_notsotinysarl0"/>
diff --git a/openerp/addons/base/res/partner/partner_view.xml b/openerp/addons/base/res/partner/partner_view.xml
index be88a41e4c6..763147fb47e 100644
--- a/openerp/addons/base/res/partner/partner_view.xml
+++ b/openerp/addons/base/res/partner/partner_view.xml
@@ -128,7 +128,7 @@
             <field name="act_window_id" ref="action_partner_address_form"/>
         </record>
         <menuitem action="action_partner_address_form" id="menu_partner_address_form"
-            groups="base.group_extended"
+            groups="base.group_extended" name="Contacts"
             parent="base.menu_address_book" sequence="30"/>
 
         <!--
@@ -397,8 +397,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="domain">[('supplier','=',1)]</field>
-            <field name="context">{'default_customer':0, 'search_default_supplier': 1, 'default_supplier':1}</field>
+            <field name="domain">[]</field>
+            <field name="context">{'search_default_supplier': 1}</field>
             <field name="filter" eval="True"/>
             <field name="help">You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects.</field>
         </record>
diff --git a/openerp/addons/base/res/partner/wizard/partner_sms_send_view.xml b/openerp/addons/base/res/partner/wizard/partner_sms_send_view.xml
index 7d84d6d405a..1e577d824b3 100644
--- a/openerp/addons/base/res/partner/wizard/partner_sms_send_view.xml
+++ b/openerp/addons/base/res/partner/wizard/partner_sms_send_view.xml
@@ -26,7 +26,7 @@
             </field>
         </record>
 
-       <act_window name="SMS Send"
+       <act_window name="Send an SMS"
             res_model="partner.sms.send"
             src_model="res.partner"
             view_mode="form"