Merge branch 'op_conversion'
Integration of op.h changes
Data split to allow for user data and system data
Merge branch 'data_conversion' into init_conversion

Conflicts:
	team_src/Init.c
	team_src/SensorCov.c