don't know what this commit is, actually
Merge branch 'master' of https://github.com/JonathanReeve/sanger

Conflicts:
	app/documents/search.php