delete logs file, add mockservice
Shell refactor

Add CORS support
Merge
Merge