Merge branch 'develop'

Conflicts:
	api/pkg/controllers/entries_controller.go
	api/pkg/inserter/main.go
	api/pkg/models/models.go
	cli/Makefile

api/pkg/utils/utils.go

@@ -78,5 +78,6 @@ func GetResolvedBaseEntry(entry models.MizuEntry) models.BaseEntryDetails {
 		StatusCode: entry.Status,
 		Method:     entry.Method,
 		Timestamp:  entry.Timestamp,
+		RequestSenderIp: entry.RequestSenderIp,
 	}
 }