serializers
settings sqllite
Merge remote-tracking branch 'origin/master'

Conflicts:
	rank/entidades/serializers.py
	rank/rank/settings.py
	rank/rank/settings.pyc
	rank/servicios/serializers.py