adds style to contact form
*** empty log message ***
Merge branch 'dev' into nestier
redireccion de mailer backend
Merge branch 'dev' into nestier
arregla dashboard
agregando avatares a usuarios
traduce alguno formularios
Adds fields to contact-form plus styling
Merge branch 'chudix' of github.com:farfanoide/agalma into chudix
adds error as flash type, transaltes some forms
Merge branch 'nestier' of github.com:farfanoide/agalma into nestier

Conflicts:
	app/views/devise/registrations/new.html.erb
adds default avatars
Merge branch 'dev' into chudix

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/contacts/new.html.erb
finishes contatct-us
Merge branch 'chudix' of github.com:farfanoide/agalma into chudix

Conflicts:
	app/assets/stylesheets/application.css.scss
almost nothing
Merge branch 'chudix' of github.com:farfanoide/agalma into chudix
modificando vistas
adds slider styles + configuration