Fix error of extend in 404 and 500. Improve the settings sample
Merge branch 'master' of https://github.com/celery/celeryproject