Merge pull request #323 from CruGlobal/MH-965

Add validation message in upload picture, Change avatar to picture
Force import all sp admins and contacts
Revise cru_status
Fix merging conflicts