changed wsgi/manage to settings dev
updated routines
merged dev - replaced settings.dev with settings.prod