[MERGE] merged with trunk addons

addons/account/account.py

addons/account/account_invoice_workflow.xml

addons/account/report/account_print_invoice.rml

addons/account/report/account_print_overdue.rml

addons/account_budget/account_budget_workflow.xml

...t_invoice_layout/report/report_account_invoice_layout.rml

...account_invoice_layout/report/special_message_invoice.rml

addons/account_payment/report/order.rml

addons/account_voucher/voucher_sales_purchase_view.xml

addons/email_template/email_template_workflow.xml

addons/event/event.py

addons/hr/process/hr_process.xml

addons/hr_contract/hr_contract_view.xml

addons/hr_expense/hr_expense_workflow.xml

addons/hr_expense/report/expense.rml

addons/hr_holidays/__openerp__.py

addons/hr_holidays/hr_holidays_workflow.xml

addons/hr_timesheet/hr_timesheet_view.xml

addons/hr_timesheet_sheet/__openerp__.py

addons/hr_timesheet_sheet/hr_timesheet_sheet.py