Reorganize ItemStacks and add lore stuff
Merge branch 'master' of http://github.com/GraniteTeam/Granite

Conflicts:
	Granite/src/main/java/org/granitemc/granite/entity/GraniteEntity.java
	Granite/src/main/java/org/granitemc/granite/entity/GraniteEntityItem.java
	Granite/src/main/java/org/granitemc/granite/entity/player/GranitePlayer.java
	GraniteAPI/src/main/java/org/granitemc/granite/api/entity/Entity.java
	GraniteAPI/src/main/java/org/granitemc/granite/api/entity/item/EntityItem.java