Fixed ServerApplication

Works with different datasets from UNdata
Merge branch 'master' of github.com:paanil/UNdataMap