fix include path
updates for new book location
Merge remote-tracking branch 'origin/develop' into skip_broken_tests