Refactored composites system a bit
Readme update
Merge branch 'master' of http://github.com/GraniteTeam/Granite

Conflicts:
	src/main/java/org/granitemc/granite/entity/GraniteEntity.java