Merge pull request #1 from jspaleta/forthays-operations

pulling over makefile change for qnx
Adjusted day/night times for FHR
Merge pull request #5 from ksterne/forthays-operations

Forthays operations