Return instance of CraftInventoryBeacon for Beacons.  Fixes BUKKIT-4521
Merge remote-tracking branch 'upstream/master'
Update references
Something to do with subprojects