log entry
Merge branch 'master' of https://github.com/JamesLeB/Stout

Conflicts:
	devlog
	lib/classes/makePDF.php