added internationalization helper in MANY files
agregado responsive, quitado responsive
fixed conflicts
solved conflicts
User admin working