Fixed broken merge regarding config.py
Fixed broken merge regarding config.py

lipis/life-line,gae-init/gae-init-babel,mdxs/gae-init-babel,mdxs/gae-init-babel,gae-init/gae-init-babel,lipis/life-line,gae-init/gae-init-babel,mdxs/gae-init-babel,gae-init/gae-init-babel,lipis/life-line