updated
Merge branch 'master' of github.com:jdelight/imagebase

Conflicts:
	imagebase/wsgi.py