largeImageContainerFix
quickfix 1.1
Merge remote-tracking branch 'origin/jonathaaaan' into Merge-branche

Conflicts:
	resolved