adding relative image and formula size
Merge remote-tracking branch 'origin/master' into philipp-test

Conflicts:
	htdocs/protected/extensions/PDFCreator/PDFCreator.php