merge max4 tango and pointgrey branches