working in user crud
1- Updating POS fronted and Backend
2- Add new module to import/export of Master Catalog
show of user already done
user show and role add in signup
Merge remote-tracking branch 'tony-usb/develop' into develop

Conflicts:
	point_of_sale_gr_ext/point_of_sale_customer.py
	point_of_sale_gr_ext/static/src/css/pos_ext.css
	point_of_sale_gr_ext/static/src/js/screens.js
	point_of_sale_gr_ext/static/src/xml/pos_extended.xml
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	groceries_data_import_export/.idea/encodings.xml
	groceries_data_import_export/.idea/groceries_data_import_export.iml
	groceries_data_import_export/.idea/misc.xml
	groceries_data_import_export/.idea/modules.xml
	groceries_data_import_export/.idea/scopes/scope_settings.xml
	groceries_data_import_export/.idea/vcs.xml
	groceries_data_import_export/.idea/workspace.xml
	groceries_data_import_export/__init__.py
	groceries_data_import_export/__openerp__.py
	groceries_data_import_export/i18n/es.po
	groceries_data_import_export/static/src/js/import_export_ext.js
	groceries_data_import_export/static/src/js/main.js
	groceries_data_import_export/view/base_menu.xml
	groceries_data_import_export/view/groceries_import_wizard_view.xml
	groceries_data_import_export/wizard/__init__.py
	groceries_data_import_export/wizard/groceries_import_wizard.py
merging