Modificacion de controllers
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/config/initializers/devise.rb
Merge branch 'master' of https://github.com/dialpapu/bikesis