Merge branch 'data_conversion'
Merge branch 'op_conversion'

Conflicts:
	team_src/Init.c
	team_src/SensorCov.c
Merge branch 'op_conversion'
Fixed incorrect size of data structure being used in memcpy
Merge branch 'master' into init_conversion