fixes UTF-8 issue while rendering thumbs for mini cart
fixes sql exception in modules which occur with Joomla 3.2
Merge branch 'master' into v3.1.0

Conflicts:
	admin/doc/releases.md
	build/version.txt
doku update
initial watermark code
fixes missing editor button tool bar for Joomla 3.2