Fly little bird :)
Conflicts :S

Conflicts:
	src/com/marine/net/play/clientbound/BlockChangePacket.java
	src/com/marine/net/play/clientbound/PlayerAbilitesPacket.java
	src/com/marine/player/PlayerAbilities.java
Merge branch 'master' of https://github.com/MarineAPI/MarineStandalone