[MERGE] from trunk, need point_of_sale updates

bzr revid: fva@openerp.com-20140127160946-yeswyv4o7t2tfbqt

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

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

diff --cc addons/point_of_sale/controllers/main.py
Simple merge

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

diff --cc addons/point_of_sale/point_of_sale_view.xml
Simple merge