Merge proposals dependent on lp://staging/~openerp-community/sugarcrm-openerp/6.1_import_sugarcrm_improvements

1. 6.1_import_sugarcrm_improvements
2. Dependent merge proposals