[MERGE] merge with latest trunk

diff --cc addons/crm/__openerp__.py
Simple merge

diff --cc addons/crm/crm_lead.py
Simple merge

diff --cc addons/crm/res_config_view.xml
Simple merge

diff --cc addons/crm/security/crm_security.xml
Simple merge

diff --cc addons/gamification/models/goal.py
Simple merge

diff --cc addons/sale/sale.py
Simple merge

diff --cc addons/sale/sale_view.xml
Simple merge