deb
Merge branch 'master' of https://github.com/Johnzero/OE7

Conflicts:
	openerp/addons/account/account_invoice.pyc
	openerp/addons/account/account_move_line.pyc
	openerp/addons/account/partner.pyc
	openerp/addons/auth_oauth/controllers/main.pyc
	openerp/addons/base/ir/ir_actions.pyc
	openerp/addons/base/ir/ir_ui_menu.pyc
	openerp/addons/base/res/res_config.pyc
	openerp/addons/lunch/lunch.pyc
	openerp/addons/mail/mail_alias.pyc
	openerp/addons/mail/mail_followers.pyc
	openerp/addons/mail/mail_mail.pyc
	openerp/addons/mail/mail_thread.pyc
	openerp/addons/mail/wizard/mail_compose_message.pyc
	openerp/addons/mrp/stock.pyc
	openerp/addons/point_of_sale/point_of_sale.pyc
	openerp/addons/point_of_sale/wizard/pos_box.pyc
	openerp/addons/project_issue/project_issue.pyc
	openerp/addons/project_issue/report/project_issue_report.pyc
	openerp/addons/resource/resource.pyc
	openerp/addons/sale/report/sale_order.pyc
	openerp/addons/sale/report/sale_report.pyc
	openerp/addons/sale/sale.pyc
	openerp/addons/sale/wizard/sale_make_invoice.pyc
	openerp/addons/sale_stock/report/sale_report.pyc
	openerp/addons/stock/stock.pyc
	openerp/addons/web/controllers/main.pyc
	openerp/osv/expression.pyc
	openerp/release.pyc
	openerp/service/web_services.pyc