conflicts merged

src/libs/middlewares/email.js

src/libs/middlewares/oauth2.js

src/libs/models/resetToken.js

src/libs/routes_v1/publication.js

src/libs/routes_v1/resetToken.js

src/libs/routes_v1/user.js

src/libs/routes_v1/user.js.save