merged branch master
Merge branch 'master' of https://github.com/sebschlicht/Graphity-Server.git