Updated ffcrm_devise
Updated ffcrm_merge