fix includes
Merge branch 'release' into develop
Fix project files so xTIMEcomposer can build this linux app