[MERGE] from trunk

addons/auth_signup/i18n/sv.po

addons/base_import_module/__init__.py

addons/base_import_module/__openerp__.py

addons/base_import_module/bin/oe_module_deploy.py

addons/base_import_module/controllers/__init__.py

addons/base_import_module/controllers/main.py

addons/base_import_module/models/__init__.py

addons/base_import_module/models/ir_module.py

addons/base_import_module/tests/test_module/__openerp__.py

...se_import_module/tests/test_module/static/src/img/c64.png

...ase_import_module/tests/test_module/static/src/js/test.js

addons/base_import_module/tests/test_module/test.xml

addons/hw_escpos/controllers/main.py

addons/hw_escpos/escpos/constants.py

addons/hw_escpos/escpos/escpos.py

addons/hw_posbox_upgrade/controllers/main.py

addons/l10n_be_coda/i18n/fi.po

addons/point_of_sale/static/src/xml/pos.xml

addons/website/data/bootstrap/alerts.less

addons/website/data/bootstrap/badges.less