Cambios en Settings
Merge branch 'master' of https://github.com/alpocr/meli

Conflicts:
	meli/settings.py
	meli/settings.pyc
Implementacion de Registration