Merged IC2 to 1.7 official branch