minor issue
fixs some merge conflicts
fixes pposts bakcned, removes locale warning when running rake
Merge branch 'dev' into chudix
adds social links
Merge branch 'dev' into nestier
Merge branch 'nestier' into dev
redireccion de mailer backend
Merge branch 'dev' into nestier
arregla dashboard