setup dev for run
Merge branch 'master' of https://github.com/JamesLeB/Stout

Conflicts:
	lib/classes/makePDF.php