add image error handling and sizing
Merge branch 'master' of github.com:blee42/WikiNow

Conflicts:
	core/__init__.pyc
	core/settings/__init__.pyc
	core/urls.pyc