Disable logging of HTTP 404 errors
Merge branch 'master' of github.com:palasthotel/turntable

Conflicts:
	drupal/images.php