Merge branch 'master' of github.com:RogerZhangHS/Post-Bukkit-Translation

Conflicts:
	What_to_do_post-Bukkit.md
Merge branch 'master' of github.com:RogerZhangHS/Post-Bukkit-Translation