Tidy up Documents + Search
Documents Class
Merge branch 'master' into WJP-Branch