Merge branch 'NextGen' of https://github.com/BuildCraft/BuildCraft into refinery

Conflicts:
	common/buildcraft/BuildCraftFactory.java