Config API
Quick random push to get the merge working
Merge branch 'master' of http://github.com/GraniteTeam/Granite

Conflicts:
	Granite/src/main/java/org/granitemc/granite/block/GraniteBlock.java
	Granite/src/main/java/org/granitemc/granite/world/GraniteWorld.java
	GraniteAPI/src/main/java/org/granitemc/granite/api/event/player/EventPlayerJoin.java