Fixed gripper merge error
Fixed bug in gateway server regarding longs for time