Fix bugs
Merge branch 'master' of github.com:St-Arai/Experiment2-1

Conflicts:
	src/main/java/org/bukkit/Color.java
	src/main/java/org/bukkit/configuration/serialization/ConfigurationSerialization.java