Merge branch 'origin/master'

Conflicts:
	java/buildcraft/api/power/IPowerEmitter.java
	java/buildcraft/api/power/IPowerReceptor.java
	java/buildcraft/api/power/PowerHandler.java
	java/buildcraft/api/power/package-info.java
	java/com/dynious/refinedrelocation/RefinedRelocation.java
	java/com/dynious/refinedrelocation/block/BlockPowerLimiter.java
	java/com/dynious/refinedrelocation/block/BlockSortingBarrel.java
	java/com/dynious/refinedrelocation/block/BlockSortingChest.java
	java/com/dynious/refinedrelocation/block/BlockSortingConnector.java
	java/com/dynious/refinedrelocation/block/ModBlocks.java
	java/com/dynious/refinedrelocation/event/EventHandler.java
	java/com/dynious/refinedrelocation/item/ItemSortingConnector.java
	java/com/dynious/refinedrelocation/network/PacketTypeHandler.java
	java/com/dynious/refinedrelocation/proxy/ClientProxy.java
	java/com/dynious/refinedrelocation/renderer/RendererMultiBlock.java
	java/com/dynious/refinedrelocation/tileentity/TileAdvancedBuffer.java
	java/com/dynious/refinedrelocation/tileentity/TileBlockExtender.java
	java/com/dynious/refinedrelocation/tileentity/TileBuffer.java
	java/com/dynious/refinedrelocation/tileentity/TilePowerLimiter.java
	java/ic2/api/energy/event/EnergyTileEvent.java
	java/ic2/api/energy/tile/IEnergyAcceptor.java
	java/ic2/api/energy/tile/IEnergySink.java
	java/ic2/api/energy/usage.txt