devise funcionando
pundit
Merge remote-tracking branch 'origin/chudix' into nestier

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/policies/user_policy.rb
	app/views/branches/index.html.erb
	config/environments/development.rb
	config/initializers/devise.rb
	db/migrate/20140210024520_add_devise_to_users.rb
merge todo
Merge branch 'dev' into nestier

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb
Merge branch 'dev' into nestier
mailer backend a varios usuarios como el orto
Merge branch 'dev' into nestier
Merge branch 'nestier' into dev
redireccion de mailer backend
Merge branch 'dev' into nestier
arregla dashboard
agregando avatares a usuarios
traduce alguno formularios
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
Merge branch 'chudix' of github.com:farfanoide/agalma into chudix

Conflicts:
	app/assets/stylesheets/application.css.scss