Merge remote-tracking branch 'origin/master' into awesome! (ammend)

Conflicts:
	assets/openperipheral/languages/languages.txt
	assets/openperipheral/scripts.txt
	build.xml
	integration/cofh/api/block/IDismantleable.java
	integration/cofh/api/core/IInitializer.java
	integration/cofh/api/core/ISimpleRegistry.java
	integration/cofh/api/core/NullSimpleRegistry.java
	integration/cofh/api/core/RegistryAccess.java
	integration/cofh/api/energy/EnergyStorage.java
	integration/cofh/api/energy/ItemEnergyContainer.java
	integration/cofh/api/energy/TileEnergyHandler.java
	integration/cofh/api/item/ITinkerableItem.java
	integration/cofh/api/tileentity/IReconfigurableFacing.java
	integration/cofh/api/tileentity/IReconfigurableSides.java
	integration/cofh/api/tileentity/IRedstoneControl.java
	integration/cofh/api/tileentity/ISidedBlockTexture.java
	integration/cofh/api/tileentity/ITileInfo.java
	integration/cofh/api/transport/IItemConduit.java
	integration/cofh/api/transport/IItemConduitConnection.java
	integration/cofh/api/world/IFeatureGenerator.java
	integration/cofh/api/world/IFeatureHandler.java
	integration/cofh/api/world/WeightedRandomBlock.java
	src/openperipheral/OpenPeripheral.java
	src/openperipheral/api/IntegrationRegistry.java
	src/openperipheral/core/Mods.java
	src/openperipheral/core/integration/ModuleBuildCraft.java
	src/openperipheral/integration/enderstorage/AdapterFrequencyOwner.java
	src/openperipheral/integration/sgcraft/AdapterStargate.java
	src/openperipheral/integration/vanilla/ModuleVanilla.java