Fix remaining merge/rebase issues, fix timers

quad/src/quad_app/control_algorithm.c

quad/src/quad_app/hw_iface.h

quad/src/quad_app/log_data.c

quad/src/quad_app/quad_app.c

quad/src/quad_app/timer.c

quad/src/quad_app/type_def.h

quad/src/quad_app/util.h

quad/xsdk_workspace/modular_quad_pid/src/hw_impl_zybo.h

...k_workspace/modular_quad_pid/src/hw_impl_zybo_axi_timer.c

...orkspace/modular_quad_pid/src/hw_impl_zybo_global_timer.c