Changed Z to uint16_t outside of OTI, fixes #7
Merge branch 'develop' into feature/encoder

* develop:
  Changed Z to uint16_t outside of OTI, fixes #7

Conflicts:
	include/parameters/fec_parameters.h
	src/parameters/fec_parameters.cpp
	src/parameters/parameter_io.cpp