Some fixes
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/tridentsdk/api/entity/Projectile.java