add test offline directory
reinstate preprocessor directives
merging re-add fpp directives
Merge remote-tracking branch 'origin/master' into shine