images folder from DOCROOT.
Merge commit '4040' into indev

Conflicts:
	config/imagemanager.php