EntityItem
A LOT of huge changes
To-do update
Merge pull request #25 from oloflarsson/EntityItem

EntityItem
Merge branch 'master' of https://github.com/AzureusNation/Granite into AzureusNation-master

Conflicts:
	src/main/java/org/granitemc/granite/api/event/player/PlayerJoinEvent.java
	src/main/java/org/granitemc/granite/entity/player/GranitePlayer.java
	src/main/resources/mappings.conf
Merge branch 'AzureusNation-master'
Fix mappings
Move Location
fix gitignore
Fix gitignore excluding certain files
Cleanup