admin merged con lo nuevo de register
Merge remote-tracking branch 'origin/master'