Added server into main (merge), Note: dont forget the edvs-data files, to show the data...