merge kelly onto dev

added ios to funf data conversion, motion data calculation.