merge

addons/.project

addons/.project.moved

addons/.pydevproject

addons/account/__terp__.py

addons/account/account.py

addons/account/account_invoice_view.xml

addons/account/account_invoice_workflow.xml

addons/account/account_menuitem.xml

addons/account/account_view.xml

addons/account/account_wizard.xml

addons/account/data/account_data2.xml

addons/account/i18n/fr_FR.po

addons/account/invoice.py

addons/account/partner.py

addons/account/process/invoice_process.xml

addons/account/process/statement_process.xml

addons/account/project/project_view.xml

addons/account/project/report/analytic_balance.py

addons/account/project/report/analytic_balance.rml

addons/account/project/report/analytic_check.py