merge with master

diff --combined __openerp__.py
index 796422c,d3d8085..ed174ee
--- 1/__openerp__.py
--- 2/__openerp__.py
+++ b/__openerp__.py
@@@ -16,12 -16,11 +16,12 @@@ This module is to configure add french 
      """,
      'author': 'L\'Heureux Cyclage',
      'website': 'http://www.heureux-cyclage.org',
-     'depends': ['bikecoop','l10n_fr', 'remembership'],
+     'depends': ['bikecoop','l10n_fr','membership'],
      'update_xml': [
          'data/bikecoop_l10n_fr.xml',
          'data/plan_comptable_general.xml',
          'view/bikecoop.xml',
 +        'wizard/create_member_view.xml',
          'demo/res_users.xml',
          'demo/membership.xml',
      ],