DDF-65: Changed thumbnail retrieval from a url through the action provider to an embedded encoding of the jpeg image
Merge branch 'master' of https://github.com/millerw8/ddf

Conflicts:
	catalog/transformer/catalog-responsequeuetransformer-html/src/main/resources/OSGI-INF/blueprint/blueprint.xml
	catalog/transformer/catalog-responsequeuetransformer-html/src/test/java/templates/SearchPageTest.java