Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/admin.php
proxy: Added support for long addresses. "vier": New style "Plus"
Merge pull request #1070 from annando/master

Moved "privacy_image_cache" into the core.