User controller modified
Merge branch 'master' of https://github.com/gtovar/bebitos