Fixing to serve static files.
Merge branch 'master' of https://github.com/adobelis/dfh2013

Conflicts:
	demotagger/media_wkf/templates/index.html
	demotagger/settings.pyc