render shapes and colors
Merge branch 'master' of github:frezned/card-renderer
Merge branch 'master' of github:frezned/card-renderer

Conflicts:
	cardrenderer/pdfcanvas.py
	cardrenderer/render.py
use sort key
Merge branch 'master' of github:frezned/card-renderer

Conflicts:
	cardrenderer/imagecanvas.py
	cardrenderer/imageresource.py
	cardrenderer/pdfcanvas.py
	cardrenderer/render.py
Merge branch 'master' of github:frezned/card-renderer
unescape HTML characters