working on bookface
Merge branch 'geoffbug' into devgeoff