[FIX] Fixed merged from master and white-space-blank-line
[FIX] PEP8 blank line contains whitespace
Merge branch 'master' of https://github.com/odoo/odoo into pep8

Conflicts:
	addons/account/account_bank_statement.py
	addons/l10n_be_coda/wizard/account_coda_import.py
	addons/purchase/purchase.py
	setup.py
[PEP8] Delete whitespaces in blank lines
Merge branch 'pep8' into cleaned-alfa

Conflicts:
	openerp/addons/base/ir/ir_actions.py
	setup.py