refactorizing + solving bugs
Merge remote-tracking branch 'hellman/master' into test
Merge remote branch 'andres/master'
Merge remote-tracking branch 'andres/master'
Merge remote-tracking branch 'fernando/master' into test
login_funcional
validar tipo de archivo en Proxy account
validar tipo de archivo en proxy user
Merge remote-tracking branch 'hellman/master' into test
feedbacks
Vista publica
Merge branch 'master' into maqueteo
fixing some bugs
modificacion fb-login
Merge remote-tracking branch 'andres/maqueteo' into maqueteo
template feedback
Merge remote-tracking branch 'hellman/master' into maqueteo
validate pictures
mailtrap
validate account pictures