Revert "resolve conflicts"

config.json.example

package.json

src/libs/app.js

src/libs/db/mongoose.js

src/libs/middlewares/passport.js

src/libs/models/user.js

src/libs/routes/api.js

src/libs/routes/user.js

src/server.js