Fix merge error (two aldryn_boilerplate entries), add thumbnail processor
Fix merge error (two aldryn_boilerplate entries), add thumbnail processor

easy_thumbnails.processors.background was listed in the
aldryn-newsblog example; may as well enable it.  The description
is "Add borders of a certain color to make the resized image fit
exactly within the dimensions given."

theirc/ServiceInfo,theirc/ServiceInfo,theirc/ServiceInfo,theirc/ServiceInfo