update 20140504 1515
Merge branch 'master' of https://github.com/Negaihoshi/Minecraft-Server