Added Swagger
Merged conflicts