Merge branch 'master' into devel
replace badges by imgs on soci form
Merge branch 'devel'