docstrings
handle blank images gracefully
Rearrange cms.image logic
Merge branch 'dev' of https://github.com/gregplaysguitar/djangocms2000 into dev