Merge branch 'master' of github.com:seyfahni/Dynmap-Multiserver into master

3 jobs for master in 1 minute and 37 seconds (queued for 2 seconds)