[MERGE] merge trunk into local branch

addons/account/res_config.py

addons/account/res_config_view.xml

addons/base_action_rule/__openerp__.py

addons/base_action_rule/base_action_rule.py

addons/base_action_rule/base_action_rule_view.xml

addons/crm/crm_view.xml

addons/email_template/email_template.py

addons/hr_contract/__init__.py

addons/hr_contract/__openerp__.py

addons/hr_contract/base_action_rule.py

addons/hr_contract/base_action_rule_view.xml

addons/hw_escpos/controllers/main.py

addons/hw_escpos/escpos/escpos.py

addons/hw_scanner/controllers/main.py

addons/mrp/security/ir.model.access.csv

addons/point_of_sale/controllers/main.py

addons/point_of_sale/point_of_sale.py

addons/point_of_sale/point_of_sale_view.xml

addons/point_of_sale/static/src/css/pos.css

.../static/src/fonts/font-awesome-4.0.3/css/font-awesome.css