Revised handling of pictures to improve consistency.
Merge remote-tracking branch 'origin/newCreateFestival' into newCreateFestival

Conflicts:
	includes/content/blocks/database_functions.php