Update with Ajax
Conflict resolution
CLeaning up ajax
Fix conflicts again
World map added