again, mysterious
Merge branch 'master' of https://github.com/JonathanReeve/sanger

Conflicts:
	app/documents/search.php