Adding local server, fix urls in entities
Merge