Fixed server bugs
Merge branch 'master' of https://github.com/padzikm/ComputationCluster
Changed type in xml to string instead of datetime